diff --git a/google-cloud-shell/src/main/java/com/google/cloud/shell/v1/CloudShellServiceSettings.java b/google-cloud-shell/src/main/java/com/google/cloud/shell/v1/CloudShellServiceSettings.java
index 7b23e1fe..1c890c87 100644
--- a/google-cloud-shell/src/main/java/com/google/cloud/shell/v1/CloudShellServiceSettings.java
+++ b/google-cloud-shell/src/main/java/com/google/cloud/shell/v1/CloudShellServiceSettings.java
@@ -206,14 +206,13 @@ public CloudShellServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((CloudShellServiceStubSettings.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-shell/src/main/java/com/google/cloud/shell/v1/stub/CloudShellServiceStubSettings.java b/google-cloud-shell/src/main/java/com/google/cloud/shell/v1/stub/CloudShellServiceStubSettings.java
index 2dfb0c2e..1ef7ed7d 100644
--- a/google-cloud-shell/src/main/java/com/google/cloud/shell/v1/stub/CloudShellServiceStubSettings.java
+++ b/google-cloud-shell/src/main/java/com/google/cloud/shell/v1/stub/CloudShellServiceStubSettings.java
@@ -512,14 +512,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-shell/src/main/java/com/google/cloud/shell/v1/stub/GrpcCloudShellServiceStub.java b/google-cloud-shell/src/main/java/com/google/cloud/shell/v1/stub/GrpcCloudShellServiceStub.java
index 46d64999..d172cdbb 100644
--- a/google-cloud-shell/src/main/java/com/google/cloud/shell/v1/stub/GrpcCloudShellServiceStub.java
+++ b/google-cloud-shell/src/main/java/com/google/cloud/shell/v1/stub/GrpcCloudShellServiceStub.java
@@ -22,7 +22,6 @@
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.shell.v1.AddPublicKeyMetadata;
 import com.google.cloud.shell.v1.AddPublicKeyRequest;
@@ -44,7 +43,6 @@
 import io.grpc.MethodDescriptor;
 import io.grpc.protobuf.ProtoUtils;
 import java.io.IOException;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 
@@ -170,65 +168,50 @@ protected GrpcCloudShellServiceStub(
         GrpcCallSettings.<GetEnvironmentRequest, Environment>newBuilder()
             .setMethodDescriptor(getEnvironmentMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetEnvironmentRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetEnvironmentRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<StartEnvironmentRequest, Operation> startEnvironmentTransportSettings =
         GrpcCallSettings.<StartEnvironmentRequest, Operation>newBuilder()
             .setMethodDescriptor(startEnvironmentMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<StartEnvironmentRequest>() {
-                  @Override
-                  public Map<String, String> extract(StartEnvironmentRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<AuthorizeEnvironmentRequest, Operation> authorizeEnvironmentTransportSettings =
         GrpcCallSettings.<AuthorizeEnvironmentRequest, Operation>newBuilder()
             .setMethodDescriptor(authorizeEnvironmentMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<AuthorizeEnvironmentRequest>() {
-                  @Override
-                  public Map<String, String> extract(AuthorizeEnvironmentRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<AddPublicKeyRequest, Operation> addPublicKeyTransportSettings =
         GrpcCallSettings.<AddPublicKeyRequest, Operation>newBuilder()
             .setMethodDescriptor(addPublicKeyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<AddPublicKeyRequest>() {
-                  @Override
-                  public Map<String, String> extract(AddPublicKeyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("environment", String.valueOf(request.getEnvironment()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("environment", String.valueOf(request.getEnvironment()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<RemovePublicKeyRequest, Operation> removePublicKeyTransportSettings =
         GrpcCallSettings.<RemovePublicKeyRequest, Operation>newBuilder()
             .setMethodDescriptor(removePublicKeyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<RemovePublicKeyRequest>() {
-                  @Override
-                  public Map<String, String> extract(RemovePublicKeyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("environment", String.valueOf(request.getEnvironment()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("environment", String.valueOf(request.getEnvironment()));
+                  return params.build();
                 })
             .build();