diff --git a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentsClient.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentsClient.java
index f72eb2eb..be5a8201 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentsClient.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentsClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.orchestration.airflow.service.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;
@@ -749,12 +748,7 @@ public static ApiFuture<ListEnvironmentsPagedResponse> createAsync(
           ListEnvironmentsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListEnvironmentsPage, ListEnvironmentsPagedResponse>() {
-            @Override
-            public ListEnvironmentsPagedResponse apply(ListEnvironmentsPage input) {
-              return new ListEnvironmentsPagedResponse(input);
-            }
-          },
+          input -> new ListEnvironmentsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentsSettings.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentsSettings.java
index 91f101e3..dadbd201 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentsSettings.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentsSettings.java
@@ -201,14 +201,13 @@ public EnvironmentsStubSettings.Builder getStubSettingsBuilder() {
       return ((EnvironmentsStubSettings.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-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/ImageVersionsClient.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/ImageVersionsClient.java
index 21abfb39..2e0d8008 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/ImageVersionsClient.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/ImageVersionsClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.orchestration.airflow.service.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;
@@ -312,12 +311,7 @@ public static ApiFuture<ListImageVersionsPagedResponse> createAsync(
           ListImageVersionsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListImageVersionsPage, ListImageVersionsPagedResponse>() {
-            @Override
-            public ListImageVersionsPagedResponse apply(ListImageVersionsPage input) {
-              return new ListImageVersionsPagedResponse(input);
-            }
-          },
+          input -> new ListImageVersionsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/ImageVersionsSettings.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/ImageVersionsSettings.java
index b1d7537f..2cfb1404 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/ImageVersionsSettings.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/ImageVersionsSettings.java
@@ -160,14 +160,13 @@ public ImageVersionsStubSettings.Builder getStubSettingsBuilder() {
       return ((ImageVersionsStubSettings.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-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/EnvironmentsStubSettings.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/EnvironmentsStubSettings.java
index bfe654b2..9134ccb3 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/EnvironmentsStubSettings.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/EnvironmentsStubSettings.java
@@ -509,14 +509,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-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/GrpcEnvironmentsStub.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/GrpcEnvironmentsStub.java
index e7991e2a..e21b8e06 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/GrpcEnvironmentsStub.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/GrpcEnvironmentsStub.java
@@ -24,7 +24,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.orchestration.airflow.service.v1.CreateEnvironmentRequest;
 import com.google.cloud.orchestration.airflow.service.v1.DeleteEnvironmentRequest;
@@ -41,7 +40,6 @@
 import io.grpc.MethodDescriptor;
 import io.grpc.protobuf.ProtoUtils;
 import java.io.IOException;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 
@@ -170,26 +168,20 @@ protected GrpcEnvironmentsStub(
         GrpcCallSettings.<CreateEnvironmentRequest, Operation>newBuilder()
             .setMethodDescriptor(createEnvironmentMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateEnvironmentRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateEnvironmentRequest 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<GetEnvironmentRequest, Environment> getEnvironmentTransportSettings =
         GrpcCallSettings.<GetEnvironmentRequest, Environment>newBuilder()
             .setMethodDescriptor(getEnvironmentMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetEnvironmentRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetEnvironmentRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListEnvironmentsRequest, ListEnvironmentsResponse>
@@ -197,39 +189,30 @@ public Map<String, String> extract(GetEnvironmentRequest request) {
             GrpcCallSettings.<ListEnvironmentsRequest, ListEnvironmentsResponse>newBuilder()
                 .setMethodDescriptor(listEnvironmentsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListEnvironmentsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListEnvironmentsRequest 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<UpdateEnvironmentRequest, Operation> updateEnvironmentTransportSettings =
         GrpcCallSettings.<UpdateEnvironmentRequest, Operation>newBuilder()
             .setMethodDescriptor(updateEnvironmentMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateEnvironmentRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateEnvironmentRequest 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<DeleteEnvironmentRequest, Operation> deleteEnvironmentTransportSettings =
         GrpcCallSettings.<DeleteEnvironmentRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteEnvironmentMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteEnvironmentRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteEnvironmentRequest 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-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/GrpcImageVersionsStub.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/GrpcImageVersionsStub.java
index abe717ae..969bcf10 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/GrpcImageVersionsStub.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/GrpcImageVersionsStub.java
@@ -23,7 +23,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.orchestration.airflow.service.v1.ListImageVersionsRequest;
 import com.google.cloud.orchestration.airflow.service.v1.ListImageVersionsResponse;
@@ -32,7 +31,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;
 
@@ -108,13 +106,10 @@ protected GrpcImageVersionsStub(
             GrpcCallSettings.<ListImageVersionsRequest, ListImageVersionsResponse>newBuilder()
                 .setMethodDescriptor(listImageVersionsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListImageVersionsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListImageVersionsRequest 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-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/ImageVersionsStubSettings.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/ImageVersionsStubSettings.java
index c09f5341..01d957d8 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/ImageVersionsStubSettings.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1/stub/ImageVersionsStubSettings.java
@@ -309,14 +309,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-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentsClient.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentsClient.java
index 440c78f4..25a644fc 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentsClient.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentsClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.orchestration.airflow.service.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;
@@ -908,12 +907,7 @@ public static ApiFuture<ListEnvironmentsPagedResponse> createAsync(
           ListEnvironmentsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListEnvironmentsPage, ListEnvironmentsPagedResponse>() {
-            @Override
-            public ListEnvironmentsPagedResponse apply(ListEnvironmentsPage input) {
-              return new ListEnvironmentsPagedResponse(input);
-            }
-          },
+          input -> new ListEnvironmentsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentsSettings.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentsSettings.java
index 092d7ecb..aacae0bf 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentsSettings.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentsSettings.java
@@ -224,14 +224,13 @@ public EnvironmentsStubSettings.Builder getStubSettingsBuilder() {
       return ((EnvironmentsStubSettings.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-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/ImageVersionsClient.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/ImageVersionsClient.java
index 875885ea..4db1b356 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/ImageVersionsClient.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/ImageVersionsClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.orchestration.airflow.service.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;
@@ -313,12 +312,7 @@ public static ApiFuture<ListImageVersionsPagedResponse> createAsync(
           ListImageVersionsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListImageVersionsPage, ListImageVersionsPagedResponse>() {
-            @Override
-            public ListImageVersionsPagedResponse apply(ListImageVersionsPage input) {
-              return new ListImageVersionsPagedResponse(input);
-            }
-          },
+          input -> new ListImageVersionsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/ImageVersionsSettings.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/ImageVersionsSettings.java
index f12e16c4..355b21b3 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/ImageVersionsSettings.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/ImageVersionsSettings.java
@@ -161,14 +161,13 @@ public ImageVersionsStubSettings.Builder getStubSettingsBuilder() {
       return ((ImageVersionsStubSettings.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-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/EnvironmentsStubSettings.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/EnvironmentsStubSettings.java
index 3cffc41b..0df01e54 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/EnvironmentsStubSettings.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/EnvironmentsStubSettings.java
@@ -624,14 +624,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-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/GrpcEnvironmentsStub.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/GrpcEnvironmentsStub.java
index 4e00bc77..ce1b0e9f 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/GrpcEnvironmentsStub.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/GrpcEnvironmentsStub.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.orchestration.airflow.service.v1beta1.CheckUpgradeRequest;
 import com.google.cloud.orchestration.airflow.service.v1beta1.CheckUpgradeResponse;
@@ -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;
 
@@ -202,26 +200,20 @@ protected GrpcEnvironmentsStub(
         GrpcCallSettings.<CreateEnvironmentRequest, Operation>newBuilder()
             .setMethodDescriptor(createEnvironmentMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateEnvironmentRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateEnvironmentRequest 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<GetEnvironmentRequest, Environment> getEnvironmentTransportSettings =
         GrpcCallSettings.<GetEnvironmentRequest, Environment>newBuilder()
             .setMethodDescriptor(getEnvironmentMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetEnvironmentRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetEnvironmentRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListEnvironmentsRequest, ListEnvironmentsResponse>
@@ -229,65 +221,50 @@ public Map<String, String> extract(GetEnvironmentRequest request) {
             GrpcCallSettings.<ListEnvironmentsRequest, ListEnvironmentsResponse>newBuilder()
                 .setMethodDescriptor(listEnvironmentsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListEnvironmentsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListEnvironmentsRequest 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<UpdateEnvironmentRequest, Operation> updateEnvironmentTransportSettings =
         GrpcCallSettings.<UpdateEnvironmentRequest, Operation>newBuilder()
             .setMethodDescriptor(updateEnvironmentMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateEnvironmentRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateEnvironmentRequest 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<DeleteEnvironmentRequest, Operation> deleteEnvironmentTransportSettings =
         GrpcCallSettings.<DeleteEnvironmentRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteEnvironmentMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteEnvironmentRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteEnvironmentRequest 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<RestartWebServerRequest, Operation> restartWebServerTransportSettings =
         GrpcCallSettings.<RestartWebServerRequest, Operation>newBuilder()
             .setMethodDescriptor(restartWebServerMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<RestartWebServerRequest>() {
-                  @Override
-                  public Map<String, String> extract(RestartWebServerRequest 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<CheckUpgradeRequest, Operation> checkUpgradeTransportSettings =
         GrpcCallSettings.<CheckUpgradeRequest, Operation>newBuilder()
             .setMethodDescriptor(checkUpgradeMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CheckUpgradeRequest>() {
-                  @Override
-                  public Map<String, String> extract(CheckUpgradeRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("environment", String.valueOf(request.getEnvironment()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("environment", String.valueOf(request.getEnvironment()));
+                  return params.build();
                 })
             .build();
 
diff --git a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/GrpcImageVersionsStub.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/GrpcImageVersionsStub.java
index 8a0f77d0..e11e4c2a 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/GrpcImageVersionsStub.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/GrpcImageVersionsStub.java
@@ -24,7 +24,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.orchestration.airflow.service.v1beta1.ListImageVersionsRequest;
 import com.google.cloud.orchestration.airflow.service.v1beta1.ListImageVersionsResponse;
@@ -33,7 +32,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;
 
@@ -110,13 +108,10 @@ protected GrpcImageVersionsStub(
             GrpcCallSettings.<ListImageVersionsRequest, ListImageVersionsResponse>newBuilder()
                 .setMethodDescriptor(listImageVersionsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListImageVersionsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListImageVersionsRequest 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-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/ImageVersionsStubSettings.java b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/ImageVersionsStubSettings.java
index 86d959bb..a08f3372 100644
--- a/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/ImageVersionsStubSettings.java
+++ b/google-cloud-orchestration-airflow/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/stub/ImageVersionsStubSettings.java
@@ -310,14 +310,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-orchestration-airflow/src/test/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentsClientTest.java b/google-cloud-orchestration-airflow/src/test/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentsClientTest.java
index 7b4e0c06..3fc20b43 100644
--- a/google-cloud-orchestration-airflow/src/test/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentsClientTest.java
+++ b/google-cloud-orchestration-airflow/src/test/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentsClientTest.java
@@ -90,7 +90,7 @@ public void tearDown() throws Exception {
   public void createEnvironmentTest() throws Exception {
     Environment expectedResponse =
         Environment.newBuilder()
-            .setName(EnvironmentName.of("[PROJECT]", "[LOCATION]", "[ENVIRONMENT]").toString())
+            .setName("name3373707")
             .setConfig(EnvironmentConfig.newBuilder().build())
             .setUuid("uuid3601339")
             .setCreateTime(Timestamp.newBuilder().build())
@@ -144,7 +144,7 @@ public void createEnvironmentExceptionTest() throws Exception {
   public void getEnvironmentTest() throws Exception {
     Environment expectedResponse =
         Environment.newBuilder()
-            .setName(EnvironmentName.of("[PROJECT]", "[LOCATION]", "[ENVIRONMENT]").toString())
+            .setName("name3373707")
             .setConfig(EnvironmentConfig.newBuilder().build())
             .setUuid("uuid3601339")
             .setCreateTime(Timestamp.newBuilder().build())
@@ -231,7 +231,7 @@ public void listEnvironmentsExceptionTest() throws Exception {
   public void updateEnvironmentTest() throws Exception {
     Environment expectedResponse =
         Environment.newBuilder()
-            .setName(EnvironmentName.of("[PROJECT]", "[LOCATION]", "[ENVIRONMENT]").toString())
+            .setName("name3373707")
             .setConfig(EnvironmentConfig.newBuilder().build())
             .setUuid("uuid3601339")
             .setCreateTime(Timestamp.newBuilder().build())
diff --git a/google-cloud-orchestration-airflow/src/test/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentsClientTest.java b/google-cloud-orchestration-airflow/src/test/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentsClientTest.java
index 0af82dfb..05705d8b 100644
--- a/google-cloud-orchestration-airflow/src/test/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentsClientTest.java
+++ b/google-cloud-orchestration-airflow/src/test/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentsClientTest.java
@@ -90,7 +90,7 @@ public void tearDown() throws Exception {
   public void createEnvironmentTest() throws Exception {
     Environment expectedResponse =
         Environment.newBuilder()
-            .setName(EnvironmentName.of("[PROJECT]", "[LOCATION]", "[ENVIRONMENT]").toString())
+            .setName("name3373707")
             .setConfig(EnvironmentConfig.newBuilder().build())
             .setUuid("uuid3601339")
             .setCreateTime(Timestamp.newBuilder().build())
@@ -144,7 +144,7 @@ public void createEnvironmentExceptionTest() throws Exception {
   public void getEnvironmentTest() throws Exception {
     Environment expectedResponse =
         Environment.newBuilder()
-            .setName(EnvironmentName.of("[PROJECT]", "[LOCATION]", "[ENVIRONMENT]").toString())
+            .setName("name3373707")
             .setConfig(EnvironmentConfig.newBuilder().build())
             .setUuid("uuid3601339")
             .setCreateTime(Timestamp.newBuilder().build())
@@ -231,7 +231,7 @@ public void listEnvironmentsExceptionTest() throws Exception {
   public void updateEnvironmentTest() throws Exception {
     Environment expectedResponse =
         Environment.newBuilder()
-            .setName(EnvironmentName.of("[PROJECT]", "[LOCATION]", "[ENVIRONMENT]").toString())
+            .setName("name3373707")
             .setConfig(EnvironmentConfig.newBuilder().build())
             .setUuid("uuid3601339")
             .setCreateTime(Timestamp.newBuilder().build())
@@ -330,7 +330,7 @@ public void deleteEnvironmentExceptionTest() throws Exception {
   public void restartWebServerTest() throws Exception {
     Environment expectedResponse =
         Environment.newBuilder()
-            .setName(EnvironmentName.of("[PROJECT]", "[LOCATION]", "[ENVIRONMENT]").toString())
+            .setName("name3373707")
             .setConfig(EnvironmentConfig.newBuilder().build())
             .setUuid("uuid3601339")
             .setCreateTime(Timestamp.newBuilder().build())
diff --git a/proto-google-cloud-orchestration-airflow-v1/clirr-ignored-differences.xml b/proto-google-cloud-orchestration-airflow-v1/clirr-ignored-differences.xml
index 780ea331..f0cd83ca 100644
--- a/proto-google-cloud-orchestration-airflow-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-orchestration-airflow-v1/clirr-ignored-differences.xml
@@ -16,4 +16,8 @@
     <className>com/google/cloud/orchestration/airflow/service/v1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/orchestration/airflow/service/v1/Environment*</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-orchestration-airflow-v1/pom.xml b/proto-google-cloud-orchestration-airflow-v1/pom.xml
index 9ffde304..e74d9a29 100644
--- a/proto-google-cloud-orchestration-airflow-v1/pom.xml
+++ b/proto-google-cloud-orchestration-airflow-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-orchestration-airflow-v1/src/main/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentName.java b/proto-google-cloud-orchestration-airflow-v1/src/main/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentName.java
deleted file mode 100644
index 0ec1146e..00000000
--- a/proto-google-cloud-orchestration-airflow-v1/src/main/java/com/google/cloud/orchestration/airflow/service/v1/EnvironmentName.java
+++ /dev/null
@@ -1,227 +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.orchestration.airflow.service.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 EnvironmentName implements ResourceName {
-  private static final PathTemplate PROJECT_LOCATION_ENVIRONMENT =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/locations/{location}/environments/{environment}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String project;
-  private final String location;
-  private final String environment;
-
-  @Deprecated
-  protected EnvironmentName() {
-    project = null;
-    location = null;
-    environment = null;
-  }
-
-  private EnvironmentName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    location = Preconditions.checkNotNull(builder.getLocation());
-    environment = Preconditions.checkNotNull(builder.getEnvironment());
-  }
-
-  public String getProject() {
-    return project;
-  }
-
-  public String getLocation() {
-    return location;
-  }
-
-  public String getEnvironment() {
-    return environment;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static EnvironmentName of(String project, String location, String environment) {
-    return newBuilder()
-        .setProject(project)
-        .setLocation(location)
-        .setEnvironment(environment)
-        .build();
-  }
-
-  public static String format(String project, String location, String environment) {
-    return newBuilder()
-        .setProject(project)
-        .setLocation(location)
-        .setEnvironment(environment)
-        .build()
-        .toString();
-  }
-
-  public static EnvironmentName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PROJECT_LOCATION_ENVIRONMENT.validatedMatch(
-            formattedString, "EnvironmentName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("environment"));
-  }
-
-  public static List<EnvironmentName> parseList(List<String> formattedStrings) {
-    List<EnvironmentName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<EnvironmentName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (EnvironmentName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_LOCATION_ENVIRONMENT.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 (environment != null) {
-            fieldMapBuilder.put("environment", environment);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PROJECT_LOCATION_ENVIRONMENT.instantiate(
-        "project", project, "location", location, "environment", environment);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      EnvironmentName that = ((EnvironmentName) o);
-      return Objects.equals(this.project, that.project)
-          && Objects.equals(this.location, that.location)
-          && Objects.equals(this.environment, that.environment);
-    }
-    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(environment);
-    return h;
-  }
-
-  /** Builder for projects/{project}/locations/{location}/environments/{environment}. */
-  public static class Builder {
-    private String project;
-    private String location;
-    private String environment;
-
-    protected Builder() {}
-
-    public String getProject() {
-      return project;
-    }
-
-    public String getLocation() {
-      return location;
-    }
-
-    public String getEnvironment() {
-      return environment;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    public Builder setLocation(String location) {
-      this.location = location;
-      return this;
-    }
-
-    public Builder setEnvironment(String environment) {
-      this.environment = environment;
-      return this;
-    }
-
-    private Builder(EnvironmentName environmentName) {
-      this.project = environmentName.project;
-      this.location = environmentName.location;
-      this.environment = environmentName.environment;
-    }
-
-    public EnvironmentName build() {
-      return new EnvironmentName(this);
-    }
-  }
-}
diff --git a/proto-google-cloud-orchestration-airflow-v1beta1/clirr-ignored-differences.xml b/proto-google-cloud-orchestration-airflow-v1beta1/clirr-ignored-differences.xml
index 25a98f2a..faa9b1a9 100644
--- a/proto-google-cloud-orchestration-airflow-v1beta1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-orchestration-airflow-v1beta1/clirr-ignored-differences.xml
@@ -16,4 +16,8 @@
     <className>com/google/cloud/orchestration/airflow/service/v1beta1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/orchestration/airflow/service/v1beta1/Environment*</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-orchestration-airflow-v1beta1/pom.xml b/proto-google-cloud-orchestration-airflow-v1beta1/pom.xml
index 00e926a7..42950fef 100644
--- a/proto-google-cloud-orchestration-airflow-v1beta1/pom.xml
+++ b/proto-google-cloud-orchestration-airflow-v1beta1/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-orchestration-airflow-v1beta1/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentName.java b/proto-google-cloud-orchestration-airflow-v1beta1/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentName.java
deleted file mode 100644
index f54586fb..00000000
--- a/proto-google-cloud-orchestration-airflow-v1beta1/src/main/java/com/google/cloud/orchestration/airflow/service/v1beta1/EnvironmentName.java
+++ /dev/null
@@ -1,227 +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.orchestration.airflow.service.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 EnvironmentName implements ResourceName {
-  private static final PathTemplate PROJECT_LOCATION_ENVIRONMENT =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/locations/{location}/environments/{environment}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String project;
-  private final String location;
-  private final String environment;
-
-  @Deprecated
-  protected EnvironmentName() {
-    project = null;
-    location = null;
-    environment = null;
-  }
-
-  private EnvironmentName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    location = Preconditions.checkNotNull(builder.getLocation());
-    environment = Preconditions.checkNotNull(builder.getEnvironment());
-  }
-
-  public String getProject() {
-    return project;
-  }
-
-  public String getLocation() {
-    return location;
-  }
-
-  public String getEnvironment() {
-    return environment;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static EnvironmentName of(String project, String location, String environment) {
-    return newBuilder()
-        .setProject(project)
-        .setLocation(location)
-        .setEnvironment(environment)
-        .build();
-  }
-
-  public static String format(String project, String location, String environment) {
-    return newBuilder()
-        .setProject(project)
-        .setLocation(location)
-        .setEnvironment(environment)
-        .build()
-        .toString();
-  }
-
-  public static EnvironmentName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PROJECT_LOCATION_ENVIRONMENT.validatedMatch(
-            formattedString, "EnvironmentName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("environment"));
-  }
-
-  public static List<EnvironmentName> parseList(List<String> formattedStrings) {
-    List<EnvironmentName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<EnvironmentName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (EnvironmentName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_LOCATION_ENVIRONMENT.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 (environment != null) {
-            fieldMapBuilder.put("environment", environment);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PROJECT_LOCATION_ENVIRONMENT.instantiate(
-        "project", project, "location", location, "environment", environment);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      EnvironmentName that = ((EnvironmentName) o);
-      return Objects.equals(this.project, that.project)
-          && Objects.equals(this.location, that.location)
-          && Objects.equals(this.environment, that.environment);
-    }
-    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(environment);
-    return h;
-  }
-
-  /** Builder for projects/{project}/locations/{location}/environments/{environment}. */
-  public static class Builder {
-    private String project;
-    private String location;
-    private String environment;
-
-    protected Builder() {}
-
-    public String getProject() {
-      return project;
-    }
-
-    public String getLocation() {
-      return location;
-    }
-
-    public String getEnvironment() {
-      return environment;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    public Builder setLocation(String location) {
-      this.location = location;
-      return this;
-    }
-
-    public Builder setEnvironment(String environment) {
-      this.environment = environment;
-      return this;
-    }
-
-    private Builder(EnvironmentName environmentName) {
-      this.project = environmentName.project;
-      this.location = environmentName.location;
-      this.environment = environmentName.environment;
-    }
-
-    public EnvironmentName build() {
-      return new EnvironmentName(this);
-    }
-  }
-}