diff --git a/services/preview/iothub/mgmt/2019-07-01-preview/devices/CHANGELOG.md b/services/preview/iothub/mgmt/2019-07-01-preview/devices/CHANGELOG.md
deleted file mode 100644
index 900ec58dc066..000000000000
--- a/services/preview/iothub/mgmt/2019-07-01-preview/devices/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Generated from https://github.com/Azure/azure-rest-api-specs/tree/3c764635e7d442b3e74caf593029fcd440b3ef82
-
-Code generator @microsoft.azure/autorest.go@~2.1.161
diff --git a/services/preview/iothub/mgmt/2019-07-01-preview/devices/iothubresource.go b/services/preview/iothub/mgmt/2019-07-01-preview/devices/iothubresource.go
index 89b4bdbe4ded..bfd7dd1f1f09 100644
--- a/services/preview/iothub/mgmt/2019-07-01-preview/devices/iothubresource.go
+++ b/services/preview/iothub/mgmt/2019-07-01-preview/devices/iothubresource.go
@@ -671,6 +671,7 @@ func (client IotHubResourceClient) GetEndpointHealth(ctx context.Context, resour
 	}
 	if result.ehdlr.hasNextLink() && result.ehdlr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -732,7 +733,6 @@ func (client IotHubResourceClient) getEndpointHealthNextResults(ctx context.Cont
 	result, err = client.GetEndpointHealthResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "devices.IotHubResourceClient", "getEndpointHealthNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
@@ -1027,6 +1027,7 @@ func (client IotHubResourceClient) GetQuotaMetrics(ctx context.Context, resource
 	}
 	if result.ihqmilr.hasNextLink() && result.ihqmilr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -1088,7 +1089,6 @@ func (client IotHubResourceClient) getQuotaMetricsNextResults(ctx context.Contex
 	result, err = client.GetQuotaMetricsResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "devices.IotHubResourceClient", "getQuotaMetricsNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
@@ -1221,6 +1221,7 @@ func (client IotHubResourceClient) GetValidSkus(ctx context.Context, resourceGro
 	}
 	if result.ihsdlr.hasNextLink() && result.ihsdlr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -1282,7 +1283,6 @@ func (client IotHubResourceClient) getValidSkusNextResults(ctx context.Context,
 	result, err = client.GetValidSkusResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "devices.IotHubResourceClient", "getValidSkusNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
@@ -1426,6 +1426,7 @@ func (client IotHubResourceClient) ListByResourceGroup(ctx context.Context, reso
 	}
 	if result.ihdlr.hasNextLink() && result.ihdlr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -1486,7 +1487,6 @@ func (client IotHubResourceClient) listByResourceGroupNextResults(ctx context.Co
 	result, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "devices.IotHubResourceClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
@@ -1540,6 +1540,7 @@ func (client IotHubResourceClient) ListBySubscription(ctx context.Context) (resu
 	}
 	if result.ihdlr.hasNextLink() && result.ihdlr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -1599,7 +1600,6 @@ func (client IotHubResourceClient) listBySubscriptionNextResults(ctx context.Con
 	result, err = client.ListBySubscriptionResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "devices.IotHubResourceClient", "listBySubscriptionNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
@@ -1658,6 +1658,7 @@ func (client IotHubResourceClient) ListEventHubConsumerGroups(ctx context.Contex
 	}
 	if result.ehcglr.hasNextLink() && result.ehcglr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -1720,7 +1721,6 @@ func (client IotHubResourceClient) listEventHubConsumerGroupsNextResults(ctx con
 	result, err = client.ListEventHubConsumerGroupsResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "devices.IotHubResourceClient", "listEventHubConsumerGroupsNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
@@ -1778,6 +1778,7 @@ func (client IotHubResourceClient) ListJobs(ctx context.Context, resourceGroupNa
 	}
 	if result.jrlr.hasNextLink() && result.jrlr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -1839,7 +1840,6 @@ func (client IotHubResourceClient) listJobsNextResults(ctx context.Context, last
 	result, err = client.ListJobsResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "devices.IotHubResourceClient", "listJobsNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
@@ -1897,6 +1897,7 @@ func (client IotHubResourceClient) ListKeys(ctx context.Context, resourceGroupNa
 	}
 	if result.sasarlr.hasNextLink() && result.sasarlr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -1958,7 +1959,6 @@ func (client IotHubResourceClient) listKeysNextResults(ctx context.Context, last
 	result, err = client.ListKeysResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "devices.IotHubResourceClient", "listKeysNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
diff --git a/services/preview/iothub/mgmt/2019-07-01-preview/devices/operations.go b/services/preview/iothub/mgmt/2019-07-01-preview/devices/operations.go
index 038fca94820a..73df5e455a62 100644
--- a/services/preview/iothub/mgmt/2019-07-01-preview/devices/operations.go
+++ b/services/preview/iothub/mgmt/2019-07-01-preview/devices/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, "devices.OperationsClient", "listNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }