diff --git a/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/AccessApprovalAdminClient.java b/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/AccessApprovalAdminClient.java
index 51a26349..2c48336c 100644
--- a/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/AccessApprovalAdminClient.java
+++ b/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/AccessApprovalAdminClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.accessapproval.v1;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -760,12 +759,7 @@ public static ApiFuture<ListApprovalRequestsPagedResponse> createAsync(
           ListApprovalRequestsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListApprovalRequestsPage, ListApprovalRequestsPagedResponse>() {
-            @Override
-            public ListApprovalRequestsPagedResponse apply(ListApprovalRequestsPage input) {
-              return new ListApprovalRequestsPagedResponse(input);
-            }
-          },
+          input -> new ListApprovalRequestsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/AccessApprovalAdminSettings.java b/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/AccessApprovalAdminSettings.java
index 193589f5..013dd6ff 100644
--- a/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/AccessApprovalAdminSettings.java
+++ b/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/AccessApprovalAdminSettings.java
@@ -202,14 +202,13 @@ public AccessApprovalStubSettings.Builder getStubSettingsBuilder() {
       return ((AccessApprovalStubSettings.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-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/stub/AccessApprovalStubSettings.java b/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/stub/AccessApprovalStubSettings.java
index 520e152c..63037718 100644
--- a/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/stub/AccessApprovalStubSettings.java
+++ b/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/stub/AccessApprovalStubSettings.java
@@ -480,14 +480,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-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/stub/GrpcAccessApprovalStub.java b/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/stub/GrpcAccessApprovalStub.java
index 67e9d136..73e92cd4 100644
--- a/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/stub/GrpcAccessApprovalStub.java
+++ b/google-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/stub/GrpcAccessApprovalStub.java
@@ -23,7 +23,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.accessapproval.v1.AccessApprovalSettings;
 import com.google.cloud.accessapproval.v1.ApprovalRequest;
@@ -41,7 +40,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;
 
@@ -198,13 +196,10 @@ protected GrpcAccessApprovalStub(
             GrpcCallSettings.<ListApprovalRequestsMessage, ListApprovalRequestsResponse>newBuilder()
                 .setMethodDescriptor(listApprovalRequestsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListApprovalRequestsMessage>() {
-                      @Override
-                      public Map<String, String> extract(ListApprovalRequestsMessage request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<GetApprovalRequestMessage, ApprovalRequest>
@@ -212,13 +207,10 @@ public Map<String, String> extract(ListApprovalRequestsMessage request) {
             GrpcCallSettings.<GetApprovalRequestMessage, ApprovalRequest>newBuilder()
                 .setMethodDescriptor(getApprovalRequestMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetApprovalRequestMessage>() {
-                      @Override
-                      public Map<String, String> extract(GetApprovalRequestMessage 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<ApproveApprovalRequestMessage, ApprovalRequest>
@@ -226,13 +218,10 @@ public Map<String, String> extract(GetApprovalRequestMessage request) {
             GrpcCallSettings.<ApproveApprovalRequestMessage, ApprovalRequest>newBuilder()
                 .setMethodDescriptor(approveApprovalRequestMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ApproveApprovalRequestMessage>() {
-                      @Override
-                      public Map<String, String> extract(ApproveApprovalRequestMessage 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<DismissApprovalRequestMessage, ApprovalRequest>
@@ -240,13 +229,10 @@ public Map<String, String> extract(ApproveApprovalRequestMessage request) {
             GrpcCallSettings.<DismissApprovalRequestMessage, ApprovalRequest>newBuilder()
                 .setMethodDescriptor(dismissApprovalRequestMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<DismissApprovalRequestMessage>() {
-                      @Override
-                      public Map<String, String> extract(DismissApprovalRequestMessage 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<GetAccessApprovalSettingsMessage, AccessApprovalSettings>
@@ -254,13 +240,10 @@ public Map<String, String> extract(DismissApprovalRequestMessage request) {
             GrpcCallSettings.<GetAccessApprovalSettingsMessage, AccessApprovalSettings>newBuilder()
                 .setMethodDescriptor(getAccessApprovalSettingsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetAccessApprovalSettingsMessage>() {
-                      @Override
-                      public Map<String, String> extract(GetAccessApprovalSettingsMessage 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<UpdateAccessApprovalSettingsMessage, AccessApprovalSettings>
@@ -269,15 +252,10 @@ public Map<String, String> extract(GetAccessApprovalSettingsMessage request) {
                 .<UpdateAccessApprovalSettingsMessage, AccessApprovalSettings>newBuilder()
                 .setMethodDescriptor(updateAccessApprovalSettingsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UpdateAccessApprovalSettingsMessage>() {
-                      @Override
-                      public Map<String, String> extract(
-                          UpdateAccessApprovalSettingsMessage request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put(
-                            "settings.name", String.valueOf(request.getSettings().getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("settings.name", String.valueOf(request.getSettings().getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<DeleteAccessApprovalSettingsMessage, Empty>
@@ -285,14 +263,10 @@ public Map<String, String> extract(
             GrpcCallSettings.<DeleteAccessApprovalSettingsMessage, Empty>newBuilder()
                 .setMethodDescriptor(deleteAccessApprovalSettingsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<DeleteAccessApprovalSettingsMessage>() {
-                      @Override
-                      public Map<String, String> extract(
-                          DeleteAccessApprovalSettingsMessage 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();