diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/FlexTemplatesServiceSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/FlexTemplatesServiceSettings.java
index d9b5492e..b8c46c3e 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/FlexTemplatesServiceSettings.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/FlexTemplatesServiceSettings.java
@@ -160,14 +160,13 @@ public FlexTemplatesServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((FlexTemplatesServiceStubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Client.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Client.java
index e3ace372..652c3348 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Client.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Client.java
@@ -16,7 +16,6 @@
 
 package com.google.dataflow.v1beta3;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -682,14 +681,7 @@ public static ApiFuture<ListJobsPagedResponse> createAsync(
       ApiFuture<ListJobsPage> futurePage =
           ListJobsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListJobsPage, ListJobsPagedResponse>() {
-            @Override
-            public ListJobsPagedResponse apply(ListJobsPage input) {
-              return new ListJobsPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListJobsPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListJobsPagedResponse(ListJobsPage page) {
@@ -757,12 +749,7 @@ public static ApiFuture<AggregatedListJobsPagedResponse> createAsync(
           AggregatedListJobsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<AggregatedListJobsPage, AggregatedListJobsPagedResponse>() {
-            @Override
-            public AggregatedListJobsPagedResponse apply(AggregatedListJobsPage input) {
-              return new AggregatedListJobsPagedResponse(input);
-            }
-          },
+          input -> new AggregatedListJobsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Settings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Settings.java
index 0a5468a7..fe1cae76 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Settings.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Settings.java
@@ -192,14 +192,13 @@ public JobsV1Beta3StubSettings.Builder getStubSettingsBuilder() {
       return ((JobsV1Beta3StubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Client.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Client.java
index 48fe7cf4..f243b64d 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Client.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Client.java
@@ -16,7 +16,6 @@
 
 package com.google.dataflow.v1beta3;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -332,12 +331,7 @@ public static ApiFuture<ListJobMessagesPagedResponse> createAsync(
           ListJobMessagesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListJobMessagesPage, ListJobMessagesPagedResponse>() {
-            @Override
-            public ListJobMessagesPagedResponse apply(ListJobMessagesPage input) {
-              return new ListJobMessagesPagedResponse(input);
-            }
-          },
+          input -> new ListJobMessagesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Settings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Settings.java
index c2d4bba0..e09b245b 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Settings.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Settings.java
@@ -162,14 +162,13 @@ public MessagesV1Beta3StubSettings.Builder getStubSettingsBuilder() {
       return ((MessagesV1Beta3StubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Client.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Client.java
index 2e4b4615..ba7b80ba 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Client.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Client.java
@@ -16,7 +16,6 @@
 
 package com.google.dataflow.v1beta3;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -478,12 +477,7 @@ public static ApiFuture<GetJobExecutionDetailsPagedResponse> createAsync(
           GetJobExecutionDetailsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<GetJobExecutionDetailsPage, GetJobExecutionDetailsPagedResponse>() {
-            @Override
-            public GetJobExecutionDetailsPagedResponse apply(GetJobExecutionDetailsPage input) {
-              return new GetJobExecutionDetailsPagedResponse(input);
-            }
-          },
+          input -> new GetJobExecutionDetailsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -563,12 +557,7 @@ public static ApiFuture<GetStageExecutionDetailsPagedResponse> createAsync(
           GetStageExecutionDetailsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<GetStageExecutionDetailsPage, GetStageExecutionDetailsPagedResponse>() {
-            @Override
-            public GetStageExecutionDetailsPagedResponse apply(GetStageExecutionDetailsPage input) {
-              return new GetStageExecutionDetailsPagedResponse(input);
-            }
-          },
+          input -> new GetStageExecutionDetailsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Settings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Settings.java
index cdeb891b..ab8c35d9 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Settings.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Settings.java
@@ -177,14 +177,13 @@ public MetricsV1Beta3StubSettings.Builder getStubSettingsBuilder() {
       return ((MetricsV1Beta3StubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/SnapshotsV1Beta3Settings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/SnapshotsV1Beta3Settings.java
index 084c4456..f37481fd 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/SnapshotsV1Beta3Settings.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/SnapshotsV1Beta3Settings.java
@@ -167,14 +167,13 @@ public SnapshotsV1Beta3StubSettings.Builder getStubSettingsBuilder() {
       return ((SnapshotsV1Beta3StubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/TemplatesServiceSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/TemplatesServiceSettings.java
index 9a78f8d2..6fc03b7d 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/TemplatesServiceSettings.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/TemplatesServiceSettings.java
@@ -167,14 +167,13 @@ public TemplatesServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((TemplatesServiceStubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/FlexTemplatesServiceStubSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/FlexTemplatesServiceStubSettings.java
index 94ce55c9..8f584168 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/FlexTemplatesServiceStubSettings.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/FlexTemplatesServiceStubSettings.java
@@ -244,14 +244,13 @@ private static Builder initDefaults(Builder builder) {
       return builder;
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
       return this;
     }
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcFlexTemplatesServiceStub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcFlexTemplatesServiceStub.java
index 57c494c4..ddea2246 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcFlexTemplatesServiceStub.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcFlexTemplatesServiceStub.java
@@ -127,7 +127,13 @@ public GrpcOperationsStub getOperationsStub() {
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcJobsV1Beta3Stub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcJobsV1Beta3Stub.java
index e1ceba33..e0bc628f 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcJobsV1Beta3Stub.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcJobsV1Beta3Stub.java
@@ -285,7 +285,13 @@ public UnaryCallable<SnapshotJobRequest, Snapshot> snapshotJobCallable() {
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMessagesV1Beta3Stub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMessagesV1Beta3Stub.java
index 6fa82831..8d0894f0 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMessagesV1Beta3Stub.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMessagesV1Beta3Stub.java
@@ -137,7 +137,13 @@ public UnaryCallable<ListJobMessagesRequest, ListJobMessagesResponse> listJobMes
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMetricsV1Beta3Stub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMetricsV1Beta3Stub.java
index 826dbd92..adc3c968 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMetricsV1Beta3Stub.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMetricsV1Beta3Stub.java
@@ -213,7 +213,13 @@ public UnaryCallable<GetJobMetricsRequest, JobMetrics> getJobMetricsCallable() {
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcSnapshotsV1Beta3Stub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcSnapshotsV1Beta3Stub.java
index a739680f..65ec375b 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcSnapshotsV1Beta3Stub.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcSnapshotsV1Beta3Stub.java
@@ -172,7 +172,13 @@ public UnaryCallable<ListSnapshotsRequest, ListSnapshotsResponse> listSnapshotsC
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcTemplatesServiceStub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcTemplatesServiceStub.java
index 177ee7bc..1ece4373 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcTemplatesServiceStub.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcTemplatesServiceStub.java
@@ -175,7 +175,13 @@ public UnaryCallable<GetTemplateRequest, GetTemplateResponse> getTemplateCallabl
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/JobsV1Beta3StubSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/JobsV1Beta3StubSettings.java
index 48853613..09070e14 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/JobsV1Beta3StubSettings.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/JobsV1Beta3StubSettings.java
@@ -486,14 +486,13 @@ private static Builder initDefaults(Builder builder) {
       return builder;
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
       return this;
     }
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MessagesV1Beta3StubSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MessagesV1Beta3StubSettings.java
index 386cfa46..f813cf37 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MessagesV1Beta3StubSettings.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MessagesV1Beta3StubSettings.java
@@ -318,14 +318,13 @@ private static Builder initDefaults(Builder builder) {
       return builder;
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
       return this;
     }
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MetricsV1Beta3StubSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MetricsV1Beta3StubSettings.java
index fba51ff4..72e4c407 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MetricsV1Beta3StubSettings.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MetricsV1Beta3StubSettings.java
@@ -448,14 +448,13 @@ private static Builder initDefaults(Builder builder) {
       return builder;
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
       return this;
     }
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/SnapshotsV1Beta3StubSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/SnapshotsV1Beta3StubSettings.java
index 073a193c..6969ccc8 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/SnapshotsV1Beta3StubSettings.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/SnapshotsV1Beta3StubSettings.java
@@ -286,14 +286,13 @@ private static Builder initDefaults(Builder builder) {
       return builder;
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
       return this;
     }
diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/TemplatesServiceStubSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/TemplatesServiceStubSettings.java
index 64382dd3..8f72d14d 100644
--- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/TemplatesServiceStubSettings.java
+++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/TemplatesServiceStubSettings.java
@@ -286,14 +286,13 @@ private static Builder initDefaults(Builder builder) {
       return builder;
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
       return this;
     }