diff --git a/services/preview/billing/mgmt/2017-04-24-preview/billing/CHANGELOG.md b/services/preview/billing/mgmt/2017-04-24-preview/billing/CHANGELOG.md
deleted file mode 100644
index 198284cd5c79..000000000000
--- a/services/preview/billing/mgmt/2017-04-24-preview/billing/CHANGELOG.md
+++ /dev/null
@@ -1,9 +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 `NewPeriodsListResultPage` parameter(s) have been changed from `(func(context.Context, PeriodsListResult) (PeriodsListResult, error))` to `(PeriodsListResult, func(context.Context, PeriodsListResult) (PeriodsListResult, error))`
-- Function `NewOperationListResultPage` parameter(s) have been changed from `(func(context.Context, OperationListResult) (OperationListResult, error))` to `(OperationListResult, func(context.Context, OperationListResult) (OperationListResult, error))`
-- Function `NewInvoicesListResultPage` parameter(s) have been changed from `(func(context.Context, InvoicesListResult) (InvoicesListResult, error))` to `(InvoicesListResult, func(context.Context, InvoicesListResult) (InvoicesListResult, error))`
diff --git a/services/preview/billing/mgmt/2017-04-24-preview/billing/invoices.go b/services/preview/billing/mgmt/2017-04-24-preview/billing/invoices.go
index 65da3221b804..f3ef0ace8c1e 100644
--- a/services/preview/billing/mgmt/2017-04-24-preview/billing/invoices.go
+++ b/services/preview/billing/mgmt/2017-04-24-preview/billing/invoices.go
@@ -245,6 +245,7 @@ func (client InvoicesClient) List(ctx context.Context, expand string, filter str
 	}
 	if result.ilr.hasNextLink() && result.ilr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -316,7 +317,6 @@ func (client InvoicesClient) listNextResults(ctx context.Context, lastResults In
 	result, err = client.ListResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "billing.InvoicesClient", "listNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
diff --git a/services/preview/billing/mgmt/2017-04-24-preview/billing/operations.go b/services/preview/billing/mgmt/2017-04-24-preview/billing/operations.go
index f7aed68de043..ccb13d71dccf 100644
--- a/services/preview/billing/mgmt/2017-04-24-preview/billing/operations.go
+++ b/services/preview/billing/mgmt/2017-04-24-preview/billing/operations.go
@@ -76,6 +76,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe
 	}
 	if result.olr.hasNextLink() && result.olr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -131,7 +132,6 @@ func (client OperationsClient) listNextResults(ctx context.Context, lastResults
 	result, err = client.ListResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "billing.OperationsClient", "listNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
diff --git a/services/preview/billing/mgmt/2017-04-24-preview/billing/periods.go b/services/preview/billing/mgmt/2017-04-24-preview/billing/periods.go
index 8772a6582108..25581f10986e 100644
--- a/services/preview/billing/mgmt/2017-04-24-preview/billing/periods.go
+++ b/services/preview/billing/mgmt/2017-04-24-preview/billing/periods.go
@@ -167,6 +167,7 @@ func (client PeriodsClient) List(ctx context.Context, filter string, skiptoken s
 	}
 	if result.plr.hasNextLink() && result.plr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -235,7 +236,6 @@ func (client PeriodsClient) listNextResults(ctx context.Context, lastResults Per
 	result, err = client.ListResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "billing.PeriodsClient", "listNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }