diff --git a/services/healthcareapis/mgmt/2020-03-15/healthcareapis/CHANGELOG.md b/services/healthcareapis/mgmt/2020-03-15/healthcareapis/CHANGELOG.md
deleted file mode 100644
index 8282c66f9a9d..000000000000
--- a/services/healthcareapis/mgmt/2020-03-15/healthcareapis/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Generated from https://github.com/Azure/azure-rest-api-specs/tree/3c764635e7d442b3e74caf593029fcd440b3ef82
-
-Code generator @microsoft.azure/autorest.go@~2.1.161
-
-## Breaking Changes
-
-- Function `NewOperationListResultPage` parameter(s) have been changed from `(func(context.Context, OperationListResult) (OperationListResult, error))` to `(OperationListResult, func(context.Context, OperationListResult) (OperationListResult, error))`
-- Function `NewServicesDescriptionListResultPage` parameter(s) have been changed from `(func(context.Context, ServicesDescriptionListResult) (ServicesDescriptionListResult, error))` to `(ServicesDescriptionListResult, func(context.Context, ServicesDescriptionListResult) (ServicesDescriptionListResult, error))`
diff --git a/services/healthcareapis/mgmt/2020-03-15/healthcareapis/operations.go b/services/healthcareapis/mgmt/2020-03-15/healthcareapis/operations.go
index 0a6b11080ef7..5ede5bff061e 100644
--- a/services/healthcareapis/mgmt/2020-03-15/healthcareapis/operations.go
+++ b/services/healthcareapis/mgmt/2020-03-15/healthcareapis/operations.go
@@ -74,6 +74,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe
 	}
 	if result.olr.hasNextLink() && result.olr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -129,7 +130,6 @@ func (client OperationsClient) listNextResults(ctx context.Context, lastResults
 	result, err = client.ListResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "healthcareapis.OperationsClient", "listNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
diff --git a/services/healthcareapis/mgmt/2020-03-15/healthcareapis/services.go b/services/healthcareapis/mgmt/2020-03-15/healthcareapis/services.go
index 0d87d5c15ee9..bec102eed46b 100644
--- a/services/healthcareapis/mgmt/2020-03-15/healthcareapis/services.go
+++ b/services/healthcareapis/mgmt/2020-03-15/healthcareapis/services.go
@@ -434,6 +434,7 @@ func (client ServicesClient) List(ctx context.Context) (result ServicesDescripti
 	}
 	if result.sdlr.hasNextLink() && result.sdlr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -493,7 +494,6 @@ func (client ServicesClient) listNextResults(ctx context.Context, lastResults Se
 	result, err = client.ListResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "healthcareapis.ServicesClient", "listNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
@@ -557,6 +557,7 @@ func (client ServicesClient) ListByResourceGroup(ctx context.Context, resourceGr
 	}
 	if result.sdlr.hasNextLink() && result.sdlr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -617,7 +618,6 @@ func (client ServicesClient) listByResourceGroupNextResults(ctx context.Context,
 	result, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "healthcareapis.ServicesClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }