diff --git a/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java b/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java
index 0df21eb4..9de1c632 100644
--- a/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java
+++ b/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.channel.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;
@@ -4328,12 +4327,7 @@ public static ApiFuture<ListCustomersPagedResponse> createAsync(
           ListCustomersPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListCustomersPage, ListCustomersPagedResponse>() {
-            @Override
-            public ListCustomersPagedResponse apply(ListCustomersPage input) {
-              return new ListCustomersPagedResponse(input);
-            }
-          },
+          input -> new ListCustomersPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -4409,12 +4403,7 @@ public static ApiFuture<ListEntitlementsPagedResponse> createAsync(
           ListEntitlementsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListEntitlementsPage, ListEntitlementsPagedResponse>() {
-            @Override
-            public ListEntitlementsPagedResponse apply(ListEntitlementsPage input) {
-              return new ListEntitlementsPagedResponse(input);
-            }
-          },
+          input -> new ListEntitlementsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -4492,12 +4481,7 @@ public static ApiFuture<ListTransferableSkusPagedResponse> createAsync(
           ListTransferableSkusPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListTransferableSkusPage, ListTransferableSkusPagedResponse>() {
-            @Override
-            public ListTransferableSkusPagedResponse apply(ListTransferableSkusPage input) {
-              return new ListTransferableSkusPagedResponse(input);
-            }
-          },
+          input -> new ListTransferableSkusPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -4582,12 +4566,7 @@ public static ApiFuture<ListTransferableOffersPagedResponse> createAsync(
           ListTransferableOffersPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListTransferableOffersPage, ListTransferableOffersPagedResponse>() {
-            @Override
-            public ListTransferableOffersPagedResponse apply(ListTransferableOffersPage input) {
-              return new ListTransferableOffersPagedResponse(input);
-            }
-          },
+          input -> new ListTransferableOffersPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -4675,12 +4654,7 @@ public static ApiFuture<ListChannelPartnerLinksPagedResponse> createAsync(
           ListChannelPartnerLinksPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListChannelPartnerLinksPage, ListChannelPartnerLinksPagedResponse>() {
-            @Override
-            public ListChannelPartnerLinksPagedResponse apply(ListChannelPartnerLinksPage input) {
-              return new ListChannelPartnerLinksPagedResponse(input);
-            }
-          },
+          input -> new ListChannelPartnerLinksPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -4766,12 +4740,7 @@ public static ApiFuture<ListProductsPagedResponse> createAsync(
           ListProductsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListProductsPage, ListProductsPagedResponse>() {
-            @Override
-            public ListProductsPagedResponse apply(ListProductsPage input) {
-              return new ListProductsPagedResponse(input);
-            }
-          },
+          input -> new ListProductsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -4841,14 +4810,7 @@ public static ApiFuture<ListSkusPagedResponse> createAsync(
       ApiFuture<ListSkusPage> futurePage =
           ListSkusPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListSkusPage, ListSkusPagedResponse>() {
-            @Override
-            public ListSkusPagedResponse apply(ListSkusPage input) {
-              return new ListSkusPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListSkusPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListSkusPagedResponse(ListSkusPage page) {
@@ -4915,14 +4877,7 @@ public static ApiFuture<ListOffersPagedResponse> createAsync(
       ApiFuture<ListOffersPage> futurePage =
           ListOffersPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListOffersPage, ListOffersPagedResponse>() {
-            @Override
-            public ListOffersPagedResponse apply(ListOffersPage input) {
-              return new ListOffersPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListOffersPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListOffersPagedResponse(ListOffersPage page) {
@@ -4997,12 +4952,7 @@ public static ApiFuture<ListPurchasableSkusPagedResponse> createAsync(
           ListPurchasableSkusPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListPurchasableSkusPage, ListPurchasableSkusPagedResponse>() {
-            @Override
-            public ListPurchasableSkusPagedResponse apply(ListPurchasableSkusPage input) {
-              return new ListPurchasableSkusPagedResponse(input);
-            }
-          },
+          input -> new ListPurchasableSkusPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -5086,12 +5036,7 @@ public static ApiFuture<ListPurchasableOffersPagedResponse> createAsync(
           ListPurchasableOffersPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListPurchasableOffersPage, ListPurchasableOffersPagedResponse>() {
-            @Override
-            public ListPurchasableOffersPagedResponse apply(ListPurchasableOffersPage input) {
-              return new ListPurchasableOffersPagedResponse(input);
-            }
-          },
+          input -> new ListPurchasableOffersPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -5174,12 +5119,7 @@ public static ApiFuture<ListSubscribersPagedResponse> createAsync(
           ListSubscribersPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListSubscribersPage, ListSubscribersPagedResponse>() {
-            @Override
-            public ListSubscribersPagedResponse apply(ListSubscribersPage input) {
-              return new ListSubscribersPagedResponse(input);
-            }
-          },
+          input -> new ListSubscribersPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceSettings.java b/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceSettings.java
index c7312a96..47fadbb6 100644
--- a/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceSettings.java
+++ b/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceSettings.java
@@ -453,14 +453,13 @@ public CloudChannelServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((CloudChannelServiceStubSettings.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-channel/src/main/java/com/google/cloud/channel/v1/stub/CloudChannelServiceStubSettings.java b/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/stub/CloudChannelServiceStubSettings.java
index c148b16f..ec776c7c 100644
--- a/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/stub/CloudChannelServiceStubSettings.java
+++ b/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/stub/CloudChannelServiceStubSettings.java
@@ -2129,14 +2129,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-channel/src/main/java/com/google/cloud/channel/v1/stub/GrpcCloudChannelServiceStub.java b/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/stub/GrpcCloudChannelServiceStub.java
index c183f40d..d9972398 100644
--- a/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/stub/GrpcCloudChannelServiceStub.java
+++ b/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/stub/GrpcCloudChannelServiceStub.java
@@ -34,7 +34,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.channel.v1.ActivateEntitlementRequest;
 import com.google.cloud.channel.v1.CancelEntitlementRequest;
@@ -97,7 +96,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;
 
@@ -614,26 +612,20 @@ protected GrpcCloudChannelServiceStub(
         GrpcCallSettings.<ListCustomersRequest, ListCustomersResponse>newBuilder()
             .setMethodDescriptor(listCustomersMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListCustomersRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListCustomersRequest 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<GetCustomerRequest, Customer> getCustomerTransportSettings =
         GrpcCallSettings.<GetCustomerRequest, Customer>newBuilder()
             .setMethodDescriptor(getCustomerMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetCustomerRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetCustomerRequest 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<
@@ -644,53 +636,40 @@ public Map<String, String> extract(GetCustomerRequest request) {
                     newBuilder()
                 .setMethodDescriptor(checkCloudIdentityAccountsExistMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CheckCloudIdentityAccountsExistRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          CheckCloudIdentityAccountsExistRequest 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<CreateCustomerRequest, Customer> createCustomerTransportSettings =
         GrpcCallSettings.<CreateCustomerRequest, Customer>newBuilder()
             .setMethodDescriptor(createCustomerMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateCustomerRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateCustomerRequest 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<UpdateCustomerRequest, Customer> updateCustomerTransportSettings =
         GrpcCallSettings.<UpdateCustomerRequest, Customer>newBuilder()
             .setMethodDescriptor(updateCustomerMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateCustomerRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateCustomerRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("customer.name", String.valueOf(request.getCustomer().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("customer.name", String.valueOf(request.getCustomer().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteCustomerRequest, Empty> deleteCustomerTransportSettings =
         GrpcCallSettings.<DeleteCustomerRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteCustomerMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteCustomerRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteCustomerRequest 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<ProvisionCloudIdentityRequest, Operation>
@@ -698,13 +677,10 @@ public Map<String, String> extract(DeleteCustomerRequest request) {
             GrpcCallSettings.<ProvisionCloudIdentityRequest, Operation>newBuilder()
                 .setMethodDescriptor(provisionCloudIdentityMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ProvisionCloudIdentityRequest>() {
-                      @Override
-                      public Map<String, String> extract(ProvisionCloudIdentityRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("customer", String.valueOf(request.getCustomer()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("customer", String.valueOf(request.getCustomer()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<ListEntitlementsRequest, ListEntitlementsResponse>
@@ -712,13 +688,10 @@ public Map<String, String> extract(ProvisionCloudIdentityRequest request) {
             GrpcCallSettings.<ListEntitlementsRequest, ListEntitlementsResponse>newBuilder()
                 .setMethodDescriptor(listEntitlementsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListEntitlementsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListEntitlementsRequest 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<ListTransferableSkusRequest, ListTransferableSkusResponse>
@@ -726,13 +699,10 @@ public Map<String, String> extract(ListEntitlementsRequest request) {
             GrpcCallSettings.<ListTransferableSkusRequest, ListTransferableSkusResponse>newBuilder()
                 .setMethodDescriptor(listTransferableSkusMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListTransferableSkusRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListTransferableSkusRequest 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<ListTransferableOffersRequest, ListTransferableOffersResponse>
@@ -741,52 +711,40 @@ public Map<String, String> extract(ListTransferableSkusRequest request) {
                 .<ListTransferableOffersRequest, ListTransferableOffersResponse>newBuilder()
                 .setMethodDescriptor(listTransferableOffersMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListTransferableOffersRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListTransferableOffersRequest 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<GetEntitlementRequest, Entitlement> getEntitlementTransportSettings =
         GrpcCallSettings.<GetEntitlementRequest, Entitlement>newBuilder()
             .setMethodDescriptor(getEntitlementMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetEntitlementRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetEntitlementRequest 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<CreateEntitlementRequest, Operation> createEntitlementTransportSettings =
         GrpcCallSettings.<CreateEntitlementRequest, Operation>newBuilder()
             .setMethodDescriptor(createEntitlementMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateEntitlementRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateEntitlementRequest 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<ChangeParametersRequest, Operation> changeParametersTransportSettings =
         GrpcCallSettings.<ChangeParametersRequest, Operation>newBuilder()
             .setMethodDescriptor(changeParametersMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ChangeParametersRequest>() {
-                  @Override
-                  public Map<String, String> extract(ChangeParametersRequest 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<ChangeRenewalSettingsRequest, Operation>
@@ -794,91 +752,70 @@ public Map<String, String> extract(ChangeParametersRequest request) {
             GrpcCallSettings.<ChangeRenewalSettingsRequest, Operation>newBuilder()
                 .setMethodDescriptor(changeRenewalSettingsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ChangeRenewalSettingsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ChangeRenewalSettingsRequest 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<ChangeOfferRequest, Operation> changeOfferTransportSettings =
         GrpcCallSettings.<ChangeOfferRequest, Operation>newBuilder()
             .setMethodDescriptor(changeOfferMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ChangeOfferRequest>() {
-                  @Override
-                  public Map<String, String> extract(ChangeOfferRequest 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<StartPaidServiceRequest, Operation> startPaidServiceTransportSettings =
         GrpcCallSettings.<StartPaidServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(startPaidServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<StartPaidServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(StartPaidServiceRequest 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<SuspendEntitlementRequest, Operation> suspendEntitlementTransportSettings =
         GrpcCallSettings.<SuspendEntitlementRequest, Operation>newBuilder()
             .setMethodDescriptor(suspendEntitlementMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SuspendEntitlementRequest>() {
-                  @Override
-                  public Map<String, String> extract(SuspendEntitlementRequest 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<CancelEntitlementRequest, Operation> cancelEntitlementTransportSettings =
         GrpcCallSettings.<CancelEntitlementRequest, Operation>newBuilder()
             .setMethodDescriptor(cancelEntitlementMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CancelEntitlementRequest>() {
-                  @Override
-                  public Map<String, String> extract(CancelEntitlementRequest 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<ActivateEntitlementRequest, Operation> activateEntitlementTransportSettings =
         GrpcCallSettings.<ActivateEntitlementRequest, Operation>newBuilder()
             .setMethodDescriptor(activateEntitlementMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ActivateEntitlementRequest>() {
-                  @Override
-                  public Map<String, String> extract(ActivateEntitlementRequest 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<TransferEntitlementsRequest, Operation> transferEntitlementsTransportSettings =
         GrpcCallSettings.<TransferEntitlementsRequest, Operation>newBuilder()
             .setMethodDescriptor(transferEntitlementsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<TransferEntitlementsRequest>() {
-                  @Override
-                  public Map<String, String> extract(TransferEntitlementsRequest 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<TransferEntitlementsToGoogleRequest, Operation>
@@ -886,14 +823,10 @@ public Map<String, String> extract(TransferEntitlementsRequest request) {
             GrpcCallSettings.<TransferEntitlementsToGoogleRequest, Operation>newBuilder()
                 .setMethodDescriptor(transferEntitlementsToGoogleMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<TransferEntitlementsToGoogleRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          TransferEntitlementsToGoogleRequest 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<ListChannelPartnerLinksRequest, ListChannelPartnerLinksResponse>
@@ -902,13 +835,10 @@ public Map<String, String> extract(
                 .<ListChannelPartnerLinksRequest, ListChannelPartnerLinksResponse>newBuilder()
                 .setMethodDescriptor(listChannelPartnerLinksMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListChannelPartnerLinksRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListChannelPartnerLinksRequest 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<GetChannelPartnerLinkRequest, ChannelPartnerLink>
@@ -916,13 +846,10 @@ public Map<String, String> extract(ListChannelPartnerLinksRequest request) {
             GrpcCallSettings.<GetChannelPartnerLinkRequest, ChannelPartnerLink>newBuilder()
                 .setMethodDescriptor(getChannelPartnerLinkMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetChannelPartnerLinkRequest>() {
-                      @Override
-                      public Map<String, String> extract(GetChannelPartnerLinkRequest 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<CreateChannelPartnerLinkRequest, ChannelPartnerLink>
@@ -930,13 +857,10 @@ public Map<String, String> extract(GetChannelPartnerLinkRequest request) {
             GrpcCallSettings.<CreateChannelPartnerLinkRequest, ChannelPartnerLink>newBuilder()
                 .setMethodDescriptor(createChannelPartnerLinkMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreateChannelPartnerLinkRequest>() {
-                      @Override
-                      public Map<String, String> extract(CreateChannelPartnerLinkRequest 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<UpdateChannelPartnerLinkRequest, ChannelPartnerLink>
@@ -944,26 +868,20 @@ public Map<String, String> extract(CreateChannelPartnerLinkRequest request) {
             GrpcCallSettings.<UpdateChannelPartnerLinkRequest, ChannelPartnerLink>newBuilder()
                 .setMethodDescriptor(updateChannelPartnerLinkMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UpdateChannelPartnerLinkRequest>() {
-                      @Override
-                      public Map<String, String> extract(UpdateChannelPartnerLinkRequest 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<LookupOfferRequest, Offer> lookupOfferTransportSettings =
         GrpcCallSettings.<LookupOfferRequest, Offer>newBuilder()
             .setMethodDescriptor(lookupOfferMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<LookupOfferRequest>() {
-                  @Override
-                  public Map<String, String> extract(LookupOfferRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("entitlement", String.valueOf(request.getEntitlement()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("entitlement", String.valueOf(request.getEntitlement()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListProductsRequest, ListProductsResponse> listProductsTransportSettings =
@@ -974,26 +892,20 @@ public Map<String, String> extract(LookupOfferRequest request) {
         GrpcCallSettings.<ListSkusRequest, ListSkusResponse>newBuilder()
             .setMethodDescriptor(listSkusMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListSkusRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListSkusRequest 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<ListOffersRequest, ListOffersResponse> listOffersTransportSettings =
         GrpcCallSettings.<ListOffersRequest, ListOffersResponse>newBuilder()
             .setMethodDescriptor(listOffersMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListOffersRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListOffersRequest 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<ListPurchasableSkusRequest, ListPurchasableSkusResponse>
@@ -1001,13 +913,10 @@ public Map<String, String> extract(ListOffersRequest request) {
             GrpcCallSettings.<ListPurchasableSkusRequest, ListPurchasableSkusResponse>newBuilder()
                 .setMethodDescriptor(listPurchasableSkusMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListPurchasableSkusRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListPurchasableSkusRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("customer", String.valueOf(request.getCustomer()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("customer", String.valueOf(request.getCustomer()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<ListPurchasableOffersRequest, ListPurchasableOffersResponse>
@@ -1016,13 +925,10 @@ public Map<String, String> extract(ListPurchasableSkusRequest request) {
                 .<ListPurchasableOffersRequest, ListPurchasableOffersResponse>newBuilder()
                 .setMethodDescriptor(listPurchasableOffersMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListPurchasableOffersRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListPurchasableOffersRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("customer", String.valueOf(request.getCustomer()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("customer", String.valueOf(request.getCustomer()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<RegisterSubscriberRequest, RegisterSubscriberResponse>
@@ -1030,13 +936,10 @@ public Map<String, String> extract(ListPurchasableOffersRequest request) {
             GrpcCallSettings.<RegisterSubscriberRequest, RegisterSubscriberResponse>newBuilder()
                 .setMethodDescriptor(registerSubscriberMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<RegisterSubscriberRequest>() {
-                      @Override
-                      public Map<String, String> extract(RegisterSubscriberRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("account", String.valueOf(request.getAccount()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("account", String.valueOf(request.getAccount()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<UnregisterSubscriberRequest, UnregisterSubscriberResponse>
@@ -1044,13 +947,10 @@ public Map<String, String> extract(RegisterSubscriberRequest request) {
             GrpcCallSettings.<UnregisterSubscriberRequest, UnregisterSubscriberResponse>newBuilder()
                 .setMethodDescriptor(unregisterSubscriberMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UnregisterSubscriberRequest>() {
-                      @Override
-                      public Map<String, String> extract(UnregisterSubscriberRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("account", String.valueOf(request.getAccount()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("account", String.valueOf(request.getAccount()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<ListSubscribersRequest, ListSubscribersResponse>
@@ -1058,13 +958,10 @@ public Map<String, String> extract(UnregisterSubscriberRequest request) {
             GrpcCallSettings.<ListSubscribersRequest, ListSubscribersResponse>newBuilder()
                 .setMethodDescriptor(listSubscribersMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListSubscribersRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListSubscribersRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("account", String.valueOf(request.getAccount()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("account", String.valueOf(request.getAccount()));
+                      return params.build();
                     })
                 .build();
 
diff --git a/proto-google-cloud-channel-v1/clirr-ignored-differences.xml b/proto-google-cloud-channel-v1/clirr-ignored-differences.xml
index 5b1692f1..4ef39602 100644
--- a/proto-google-cloud-channel-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-channel-v1/clirr-ignored-differences.xml
@@ -16,4 +16,8 @@
     <className>com/google/cloud/channel/v1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/channel/v1/SkuName*</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/SkuName.java b/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/SkuName.java
deleted file mode 100644
index 0d920e81..00000000
--- a/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/SkuName.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.cloud.channel.v1;
-
-import com.google.api.pathtemplate.PathTemplate;
-import com.google.api.resourcenames.ResourceName;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import javax.annotation.Generated;
-
-// AUTO-GENERATED DOCUMENTATION AND CLASS.
-@Generated("by gapic-generator-java")
-public class SkuName implements ResourceName {
-  private static final PathTemplate PRODUCT_SKU =
-      PathTemplate.createWithoutUrlEncoding("products/{product}/skus/{sku}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String product;
-  private final String sku;
-
-  @Deprecated
-  protected SkuName() {
-    product = null;
-    sku = null;
-  }
-
-  private SkuName(Builder builder) {
-    product = Preconditions.checkNotNull(builder.getProduct());
-    sku = Preconditions.checkNotNull(builder.getSku());
-  }
-
-  public String getProduct() {
-    return product;
-  }
-
-  public String getSku() {
-    return sku;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static SkuName of(String product, String sku) {
-    return newBuilder().setProduct(product).setSku(sku).build();
-  }
-
-  public static String format(String product, String sku) {
-    return newBuilder().setProduct(product).setSku(sku).build().toString();
-  }
-
-  public static SkuName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PRODUCT_SKU.validatedMatch(
-            formattedString, "SkuName.parse: formattedString not in valid format");
-    return of(matchMap.get("product"), matchMap.get("sku"));
-  }
-
-  public static List<SkuName> parseList(List<String> formattedStrings) {
-    List<SkuName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<SkuName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (SkuName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PRODUCT_SKU.matches(formattedString);
-  }
-
-  @Override
-  public Map<String, String> getFieldValuesMap() {
-    if (fieldValuesMap == null) {
-      synchronized (this) {
-        if (fieldValuesMap == null) {
-          ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
-          if (product != null) {
-            fieldMapBuilder.put("product", product);
-          }
-          if (sku != null) {
-            fieldMapBuilder.put("sku", sku);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PRODUCT_SKU.instantiate("product", product, "sku", sku);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      SkuName that = ((SkuName) o);
-      return Objects.equals(this.product, that.product) && Objects.equals(this.sku, that.sku);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= Objects.hashCode(product);
-    h *= 1000003;
-    h ^= Objects.hashCode(sku);
-    return h;
-  }
-
-  /** Builder for products/{product}/skus/{sku}. */
-  public static class Builder {
-    private String product;
-    private String sku;
-
-    protected Builder() {}
-
-    public String getProduct() {
-      return product;
-    }
-
-    public String getSku() {
-      return sku;
-    }
-
-    public Builder setProduct(String product) {
-      this.product = product;
-      return this;
-    }
-
-    public Builder setSku(String sku) {
-      this.sku = sku;
-      return this;
-    }
-
-    private Builder(SkuName skuName) {
-      this.product = skuName.product;
-      this.sku = skuName.sku;
-    }
-
-    public SkuName build() {
-      return new SkuName(this);
-    }
-  }
-}