diff --git a/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1/DataFusionClient.java b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1/DataFusionClient.java
index 91d53f13..8a462f61 100644
--- a/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1/DataFusionClient.java
+++ b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1/DataFusionClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.datafusion.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;
@@ -822,12 +821,7 @@ public static ApiFuture<ListAvailableVersionsPagedResponse> createAsync(
           ListAvailableVersionsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListAvailableVersionsPage, ListAvailableVersionsPagedResponse>() {
-            @Override
-            public ListAvailableVersionsPagedResponse apply(ListAvailableVersionsPage input) {
-              return new ListAvailableVersionsPagedResponse(input);
-            }
-          },
+          input -> new ListAvailableVersionsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -907,12 +901,7 @@ public static ApiFuture<ListInstancesPagedResponse> createAsync(
           ListInstancesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListInstancesPage, ListInstancesPagedResponse>() {
-            @Override
-            public ListInstancesPagedResponse apply(ListInstancesPage input) {
-              return new ListInstancesPagedResponse(input);
-            }
-          },
+          input -> new ListInstancesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1/DataFusionSettings.java b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1/DataFusionSettings.java
index 7b63173c..84b2accd 100644
--- a/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1/DataFusionSettings.java
+++ b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1/DataFusionSettings.java
@@ -220,14 +220,13 @@ public DataFusionStubSettings.Builder getStubSettingsBuilder() {
       return ((DataFusionStubSettings.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-data-fusion/src/main/java/com/google/cloud/datafusion/v1/stub/DataFusionStubSettings.java b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1/stub/DataFusionStubSettings.java
index 15c62400..228fec36 100644
--- a/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1/stub/DataFusionStubSettings.java
+++ b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1/stub/DataFusionStubSettings.java
@@ -655,14 +655,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-data-fusion/src/main/java/com/google/cloud/datafusion/v1/stub/GrpcDataFusionStub.java b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1/stub/GrpcDataFusionStub.java
index 8ebaee5f..30aec95f 100644
--- a/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1/stub/GrpcDataFusionStub.java
+++ b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1/stub/GrpcDataFusionStub.java
@@ -25,7 +25,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.datafusion.v1.CreateInstanceRequest;
 import com.google.cloud.datafusion.v1.DeleteInstanceRequest;
@@ -45,7 +44,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;
 
@@ -196,91 +194,70 @@ protected GrpcDataFusionStub(
                 .<ListAvailableVersionsRequest, ListAvailableVersionsResponse>newBuilder()
                 .setMethodDescriptor(listAvailableVersionsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListAvailableVersionsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListAvailableVersionsRequest 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<ListInstancesRequest, ListInstancesResponse> listInstancesTransportSettings =
         GrpcCallSettings.<ListInstancesRequest, ListInstancesResponse>newBuilder()
             .setMethodDescriptor(listInstancesMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListInstancesRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListInstancesRequest 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<GetInstanceRequest, Instance> getInstanceTransportSettings =
         GrpcCallSettings.<GetInstanceRequest, Instance>newBuilder()
             .setMethodDescriptor(getInstanceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetInstanceRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetInstanceRequest 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<CreateInstanceRequest, Operation> createInstanceTransportSettings =
         GrpcCallSettings.<CreateInstanceRequest, Operation>newBuilder()
             .setMethodDescriptor(createInstanceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateInstanceRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateInstanceRequest 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<DeleteInstanceRequest, Operation> deleteInstanceTransportSettings =
         GrpcCallSettings.<DeleteInstanceRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteInstanceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteInstanceRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteInstanceRequest 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<UpdateInstanceRequest, Operation> updateInstanceTransportSettings =
         GrpcCallSettings.<UpdateInstanceRequest, Operation>newBuilder()
             .setMethodDescriptor(updateInstanceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateInstanceRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateInstanceRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("instance.name", String.valueOf(request.getInstance().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("instance.name", String.valueOf(request.getInstance().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<RestartInstanceRequest, Operation> restartInstanceTransportSettings =
         GrpcCallSettings.<RestartInstanceRequest, Operation>newBuilder()
             .setMethodDescriptor(restartInstanceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<RestartInstanceRequest>() {
-                  @Override
-                  public Map<String, String> extract(RestartInstanceRequest 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();
 
diff --git a/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/DataFusionClient.java b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/DataFusionClient.java
index e12ba606..a3941e69 100644
--- a/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/DataFusionClient.java
+++ b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/DataFusionClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.datafusion.v1beta1;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -1349,12 +1348,7 @@ public static ApiFuture<ListAvailableVersionsPagedResponse> createAsync(
           ListAvailableVersionsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListAvailableVersionsPage, ListAvailableVersionsPagedResponse>() {
-            @Override
-            public ListAvailableVersionsPagedResponse apply(ListAvailableVersionsPage input) {
-              return new ListAvailableVersionsPagedResponse(input);
-            }
-          },
+          input -> new ListAvailableVersionsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -1434,12 +1428,7 @@ public static ApiFuture<ListInstancesPagedResponse> createAsync(
           ListInstancesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListInstancesPage, ListInstancesPagedResponse>() {
-            @Override
-            public ListInstancesPagedResponse apply(ListInstancesPage input) {
-              return new ListInstancesPagedResponse(input);
-            }
-          },
+          input -> new ListInstancesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -1515,12 +1504,7 @@ public static ApiFuture<ListNamespacesPagedResponse> createAsync(
           ListNamespacesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListNamespacesPage, ListNamespacesPagedResponse>() {
-            @Override
-            public ListNamespacesPagedResponse apply(ListNamespacesPage input) {
-              return new ListNamespacesPagedResponse(input);
-            }
-          },
+          input -> new ListNamespacesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -1596,12 +1580,7 @@ public static ApiFuture<ListDnsPeeringsPagedResponse> createAsync(
           ListDnsPeeringsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListDnsPeeringsPage, ListDnsPeeringsPagedResponse>() {
-            @Override
-            public ListDnsPeeringsPagedResponse apply(ListDnsPeeringsPage input) {
-              return new ListDnsPeeringsPagedResponse(input);
-            }
-          },
+          input -> new ListDnsPeeringsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/DataFusionSettings.java b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/DataFusionSettings.java
index 5cba6d80..265c3664 100644
--- a/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/DataFusionSettings.java
+++ b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/DataFusionSettings.java
@@ -265,14 +265,13 @@ public DataFusionStubSettings.Builder getStubSettingsBuilder() {
       return ((DataFusionStubSettings.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-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/stub/DataFusionStubSettings.java b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/stub/DataFusionStubSettings.java
index 13a45d28..51a00d8e 100644
--- a/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/stub/DataFusionStubSettings.java
+++ b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/stub/DataFusionStubSettings.java
@@ -941,14 +941,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-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/stub/GrpcDataFusionStub.java b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/stub/GrpcDataFusionStub.java
index 89e338d5..e108caa5 100644
--- a/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/stub/GrpcDataFusionStub.java
+++ b/google-cloud-data-fusion/src/main/java/com/google/cloud/datafusion/v1beta1/stub/GrpcDataFusionStub.java
@@ -28,7 +28,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.datafusion.v1beta1.AddDnsPeeringRequest;
 import com.google.cloud.datafusion.v1beta1.AddDnsPeeringResponse;
@@ -59,7 +58,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;
 
@@ -291,104 +289,80 @@ protected GrpcDataFusionStub(
                 .<ListAvailableVersionsRequest, ListAvailableVersionsResponse>newBuilder()
                 .setMethodDescriptor(listAvailableVersionsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListAvailableVersionsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListAvailableVersionsRequest 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<ListInstancesRequest, ListInstancesResponse> listInstancesTransportSettings =
         GrpcCallSettings.<ListInstancesRequest, ListInstancesResponse>newBuilder()
             .setMethodDescriptor(listInstancesMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListInstancesRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListInstancesRequest 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<GetInstanceRequest, Instance> getInstanceTransportSettings =
         GrpcCallSettings.<GetInstanceRequest, Instance>newBuilder()
             .setMethodDescriptor(getInstanceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetInstanceRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetInstanceRequest 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<CreateInstanceRequest, Operation> createInstanceTransportSettings =
         GrpcCallSettings.<CreateInstanceRequest, Operation>newBuilder()
             .setMethodDescriptor(createInstanceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateInstanceRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateInstanceRequest 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<DeleteInstanceRequest, Operation> deleteInstanceTransportSettings =
         GrpcCallSettings.<DeleteInstanceRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteInstanceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteInstanceRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteInstanceRequest 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<UpdateInstanceRequest, Operation> updateInstanceTransportSettings =
         GrpcCallSettings.<UpdateInstanceRequest, Operation>newBuilder()
             .setMethodDescriptor(updateInstanceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateInstanceRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateInstanceRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("instance.name", String.valueOf(request.getInstance().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("instance.name", String.valueOf(request.getInstance().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<RestartInstanceRequest, Operation> restartInstanceTransportSettings =
         GrpcCallSettings.<RestartInstanceRequest, Operation>newBuilder()
             .setMethodDescriptor(restartInstanceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<RestartInstanceRequest>() {
-                  @Override
-                  public Map<String, String> extract(RestartInstanceRequest 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<UpgradeInstanceRequest, Operation> upgradeInstanceTransportSettings =
         GrpcCallSettings.<UpgradeInstanceRequest, Operation>newBuilder()
             .setMethodDescriptor(upgradeInstanceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpgradeInstanceRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpgradeInstanceRequest 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<RemoveIamPolicyRequest, RemoveIamPolicyResponse>
@@ -396,13 +370,10 @@ public Map<String, String> extract(UpgradeInstanceRequest request) {
             GrpcCallSettings.<RemoveIamPolicyRequest, RemoveIamPolicyResponse>newBuilder()
                 .setMethodDescriptor(removeIamPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<RemoveIamPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(RemoveIamPolicyRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("resource", String.valueOf(request.getResource()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("resource", String.valueOf(request.getResource()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<ListNamespacesRequest, ListNamespacesResponse>
@@ -410,26 +381,20 @@ public Map<String, String> extract(RemoveIamPolicyRequest request) {
             GrpcCallSettings.<ListNamespacesRequest, ListNamespacesResponse>newBuilder()
                 .setMethodDescriptor(listNamespacesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListNamespacesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListNamespacesRequest 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<AddDnsPeeringRequest, AddDnsPeeringResponse> addDnsPeeringTransportSettings =
         GrpcCallSettings.<AddDnsPeeringRequest, AddDnsPeeringResponse>newBuilder()
             .setMethodDescriptor(addDnsPeeringMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<AddDnsPeeringRequest>() {
-                  @Override
-                  public Map<String, String> extract(AddDnsPeeringRequest 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<RemoveDnsPeeringRequest, RemoveDnsPeeringResponse>
@@ -437,13 +402,10 @@ public Map<String, String> extract(AddDnsPeeringRequest request) {
             GrpcCallSettings.<RemoveDnsPeeringRequest, RemoveDnsPeeringResponse>newBuilder()
                 .setMethodDescriptor(removeDnsPeeringMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<RemoveDnsPeeringRequest>() {
-                      @Override
-                      public Map<String, String> extract(RemoveDnsPeeringRequest 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<ListDnsPeeringsRequest, ListDnsPeeringsResponse>
@@ -451,13 +413,10 @@ public Map<String, String> extract(RemoveDnsPeeringRequest request) {
             GrpcCallSettings.<ListDnsPeeringsRequest, ListDnsPeeringsResponse>newBuilder()
                 .setMethodDescriptor(listDnsPeeringsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListDnsPeeringsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListDnsPeeringsRequest 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();
 
diff --git a/google-cloud-data-fusion/src/test/java/com/google/cloud/datafusion/v1/DataFusionClientTest.java b/google-cloud-data-fusion/src/test/java/com/google/cloud/datafusion/v1/DataFusionClientTest.java
index 98422809..3001b2c0 100644
--- a/google-cloud-data-fusion/src/test/java/com/google/cloud/datafusion/v1/DataFusionClientTest.java
+++ b/google-cloud-data-fusion/src/test/java/com/google/cloud/datafusion/v1/DataFusionClientTest.java
@@ -199,7 +199,7 @@ public void listInstancesExceptionTest() throws Exception {
   public void getInstanceTest() throws Exception {
     Instance expectedResponse =
         Instance.newBuilder()
-            .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString())
+            .setName("name3373707")
             .setDescription("description-1724546052")
             .setEnableStackdriverLogging(true)
             .setEnableStackdriverMonitoring(true)
@@ -261,7 +261,7 @@ public void getInstanceExceptionTest() throws Exception {
   public void createInstanceTest() throws Exception {
     Instance expectedResponse =
         Instance.newBuilder()
-            .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString())
+            .setName("name3373707")
             .setDescription("description-1724546052")
             .setEnableStackdriverLogging(true)
             .setEnableStackdriverMonitoring(true)
@@ -379,7 +379,7 @@ public void deleteInstanceExceptionTest() throws Exception {
   public void updateInstanceTest() throws Exception {
     Instance expectedResponse =
         Instance.newBuilder()
-            .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString())
+            .setName("name3373707")
             .setDescription("description-1724546052")
             .setEnableStackdriverLogging(true)
             .setEnableStackdriverMonitoring(true)
@@ -452,7 +452,7 @@ public void updateInstanceExceptionTest() throws Exception {
   public void restartInstanceTest() throws Exception {
     Instance expectedResponse =
         Instance.newBuilder()
-            .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString())
+            .setName("name3373707")
             .setDescription("description-1724546052")
             .setEnableStackdriverLogging(true)
             .setEnableStackdriverMonitoring(true)
diff --git a/proto-google-cloud-data-fusion-v1/clirr-ignored-differences.xml b/proto-google-cloud-data-fusion-v1/clirr-ignored-differences.xml
index aef005f6..c62a7c50 100644
--- a/proto-google-cloud-data-fusion-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-data-fusion-v1/clirr-ignored-differences.xml
@@ -16,4 +16,8 @@
     <className>com/google/cloud/datafusion/v1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/datafusion/v1/InstanceName*</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-data-fusion-v1/pom.xml b/proto-google-cloud-data-fusion-v1/pom.xml
index 7fbd6365..201edf4f 100644
--- a/proto-google-cloud-data-fusion-v1/pom.xml
+++ b/proto-google-cloud-data-fusion-v1/pom.xml
@@ -21,14 +21,6 @@
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-common-protos</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.api</groupId>
-      <artifactId>api-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/proto-google-cloud-data-fusion-v1/src/main/java/com/google/cloud/datafusion/v1/InstanceName.java b/proto-google-cloud-data-fusion-v1/src/main/java/com/google/cloud/datafusion/v1/InstanceName.java
deleted file mode 100644
index e6d899f2..00000000
--- a/proto-google-cloud-data-fusion-v1/src/main/java/com/google/cloud/datafusion/v1/InstanceName.java
+++ /dev/null
@@ -1,223 +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.datafusion.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 InstanceName implements ResourceName {
-  private static final PathTemplate PROJECT_LOCATION_INSTANCE =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/locations/{location}/instances/{instance}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String project;
-  private final String location;
-  private final String instance;
-
-  @Deprecated
-  protected InstanceName() {
-    project = null;
-    location = null;
-    instance = null;
-  }
-
-  private InstanceName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    location = Preconditions.checkNotNull(builder.getLocation());
-    instance = Preconditions.checkNotNull(builder.getInstance());
-  }
-
-  public String getProject() {
-    return project;
-  }
-
-  public String getLocation() {
-    return location;
-  }
-
-  public String getInstance() {
-    return instance;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static InstanceName of(String project, String location, String instance) {
-    return newBuilder().setProject(project).setLocation(location).setInstance(instance).build();
-  }
-
-  public static String format(String project, String location, String instance) {
-    return newBuilder()
-        .setProject(project)
-        .setLocation(location)
-        .setInstance(instance)
-        .build()
-        .toString();
-  }
-
-  public static InstanceName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PROJECT_LOCATION_INSTANCE.validatedMatch(
-            formattedString, "InstanceName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("instance"));
-  }
-
-  public static List<InstanceName> parseList(List<String> formattedStrings) {
-    List<InstanceName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<InstanceName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (InstanceName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_LOCATION_INSTANCE.matches(formattedString);
-  }
-
-  @Override
-  public Map<String, String> getFieldValuesMap() {
-    if (fieldValuesMap == null) {
-      synchronized (this) {
-        if (fieldValuesMap == null) {
-          ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
-          if (project != null) {
-            fieldMapBuilder.put("project", project);
-          }
-          if (location != null) {
-            fieldMapBuilder.put("location", location);
-          }
-          if (instance != null) {
-            fieldMapBuilder.put("instance", instance);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PROJECT_LOCATION_INSTANCE.instantiate(
-        "project", project, "location", location, "instance", instance);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      InstanceName that = ((InstanceName) o);
-      return Objects.equals(this.project, that.project)
-          && Objects.equals(this.location, that.location)
-          && Objects.equals(this.instance, that.instance);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= Objects.hashCode(project);
-    h *= 1000003;
-    h ^= Objects.hashCode(location);
-    h *= 1000003;
-    h ^= Objects.hashCode(instance);
-    return h;
-  }
-
-  /** Builder for projects/{project}/locations/{location}/instances/{instance}. */
-  public static class Builder {
-    private String project;
-    private String location;
-    private String instance;
-
-    protected Builder() {}
-
-    public String getProject() {
-      return project;
-    }
-
-    public String getLocation() {
-      return location;
-    }
-
-    public String getInstance() {
-      return instance;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    public Builder setLocation(String location) {
-      this.location = location;
-      return this;
-    }
-
-    public Builder setInstance(String instance) {
-      this.instance = instance;
-      return this;
-    }
-
-    private Builder(InstanceName instanceName) {
-      this.project = instanceName.project;
-      this.location = instanceName.location;
-      this.instance = instanceName.instance;
-    }
-
-    public InstanceName build() {
-      return new InstanceName(this);
-    }
-  }
-}
diff --git a/proto-google-cloud-data-fusion-v1beta1/clirr-ignored-differences.xml b/proto-google-cloud-data-fusion-v1beta1/clirr-ignored-differences.xml
index 5de8e032..cb02b727 100644
--- a/proto-google-cloud-data-fusion-v1beta1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-data-fusion-v1beta1/clirr-ignored-differences.xml
@@ -16,4 +16,8 @@
     <className>com/google/cloud/datafusion/v1beta1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/datafusion/v1beta1/NamespaceName*</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-data-fusion-v1beta1/src/main/java/com/google/cloud/datafusion/v1beta1/NamespaceName.java b/proto-google-cloud-data-fusion-v1beta1/src/main/java/com/google/cloud/datafusion/v1beta1/NamespaceName.java
deleted file mode 100644
index f00f73b9..00000000
--- a/proto-google-cloud-data-fusion-v1beta1/src/main/java/com/google/cloud/datafusion/v1beta1/NamespaceName.java
+++ /dev/null
@@ -1,261 +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.datafusion.v1beta1;
-
-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 NamespaceName implements ResourceName {
-  private static final PathTemplate PROJECT_LOCATION_INSTANCE_NAMESPACE =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/locations/{location}/instances/{instance}/namespaces/{namespace}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String project;
-  private final String location;
-  private final String instance;
-  private final String namespace;
-
-  @Deprecated
-  protected NamespaceName() {
-    project = null;
-    location = null;
-    instance = null;
-    namespace = null;
-  }
-
-  private NamespaceName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    location = Preconditions.checkNotNull(builder.getLocation());
-    instance = Preconditions.checkNotNull(builder.getInstance());
-    namespace = Preconditions.checkNotNull(builder.getNamespace());
-  }
-
-  public String getProject() {
-    return project;
-  }
-
-  public String getLocation() {
-    return location;
-  }
-
-  public String getInstance() {
-    return instance;
-  }
-
-  public String getNamespace() {
-    return namespace;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static NamespaceName of(
-      String project, String location, String instance, String namespace) {
-    return newBuilder()
-        .setProject(project)
-        .setLocation(location)
-        .setInstance(instance)
-        .setNamespace(namespace)
-        .build();
-  }
-
-  public static String format(String project, String location, String instance, String namespace) {
-    return newBuilder()
-        .setProject(project)
-        .setLocation(location)
-        .setInstance(instance)
-        .setNamespace(namespace)
-        .build()
-        .toString();
-  }
-
-  public static NamespaceName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PROJECT_LOCATION_INSTANCE_NAMESPACE.validatedMatch(
-            formattedString, "NamespaceName.parse: formattedString not in valid format");
-    return of(
-        matchMap.get("project"),
-        matchMap.get("location"),
-        matchMap.get("instance"),
-        matchMap.get("namespace"));
-  }
-
-  public static List<NamespaceName> parseList(List<String> formattedStrings) {
-    List<NamespaceName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<NamespaceName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (NamespaceName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_LOCATION_INSTANCE_NAMESPACE.matches(formattedString);
-  }
-
-  @Override
-  public Map<String, String> getFieldValuesMap() {
-    if (fieldValuesMap == null) {
-      synchronized (this) {
-        if (fieldValuesMap == null) {
-          ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
-          if (project != null) {
-            fieldMapBuilder.put("project", project);
-          }
-          if (location != null) {
-            fieldMapBuilder.put("location", location);
-          }
-          if (instance != null) {
-            fieldMapBuilder.put("instance", instance);
-          }
-          if (namespace != null) {
-            fieldMapBuilder.put("namespace", namespace);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PROJECT_LOCATION_INSTANCE_NAMESPACE.instantiate(
-        "project", project, "location", location, "instance", instance, "namespace", namespace);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      NamespaceName that = ((NamespaceName) o);
-      return Objects.equals(this.project, that.project)
-          && Objects.equals(this.location, that.location)
-          && Objects.equals(this.instance, that.instance)
-          && Objects.equals(this.namespace, that.namespace);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= Objects.hashCode(project);
-    h *= 1000003;
-    h ^= Objects.hashCode(location);
-    h *= 1000003;
-    h ^= Objects.hashCode(instance);
-    h *= 1000003;
-    h ^= Objects.hashCode(namespace);
-    return h;
-  }
-
-  /**
-   * Builder for
-   * projects/{project}/locations/{location}/instances/{instance}/namespaces/{namespace}.
-   */
-  public static class Builder {
-    private String project;
-    private String location;
-    private String instance;
-    private String namespace;
-
-    protected Builder() {}
-
-    public String getProject() {
-      return project;
-    }
-
-    public String getLocation() {
-      return location;
-    }
-
-    public String getInstance() {
-      return instance;
-    }
-
-    public String getNamespace() {
-      return namespace;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    public Builder setLocation(String location) {
-      this.location = location;
-      return this;
-    }
-
-    public Builder setInstance(String instance) {
-      this.instance = instance;
-      return this;
-    }
-
-    public Builder setNamespace(String namespace) {
-      this.namespace = namespace;
-      return this;
-    }
-
-    private Builder(NamespaceName namespaceName) {
-      this.project = namespaceName.project;
-      this.location = namespaceName.location;
-      this.instance = namespaceName.instance;
-      this.namespace = namespaceName.namespace;
-    }
-
-    public NamespaceName build() {
-      return new NamespaceName(this);
-    }
-  }
-}