diff --git a/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Client.java b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Client.java
index 3eeb3e63..99b13ea5 100644
--- a/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Client.java
+++ b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Client.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.binaryauthorization.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;
@@ -981,12 +980,7 @@ public static ApiFuture<ListAttestorsPagedResponse> createAsync(
           ListAttestorsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListAttestorsPage, ListAttestorsPagedResponse>() {
-            @Override
-            public ListAttestorsPagedResponse apply(ListAttestorsPage input) {
-              return new ListAttestorsPagedResponse(input);
-            }
-          },
+          input -> new ListAttestorsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Settings.java b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Settings.java
index 58888917..a088c822 100644
--- a/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Settings.java
+++ b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Settings.java
@@ -202,14 +202,13 @@ public BinauthzManagementServiceV1Beta1StubSettings.Builder getStubSettingsBuild
       return ((BinauthzManagementServiceV1Beta1StubSettings.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-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/BinauthzManagementServiceV1Beta1StubSettings.java b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/BinauthzManagementServiceV1Beta1StubSettings.java
index bd3293d1..c7ff00a5 100644
--- a/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/BinauthzManagementServiceV1Beta1StubSettings.java
+++ b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/BinauthzManagementServiceV1Beta1StubSettings.java
@@ -444,14 +444,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-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/GrpcBinauthzManagementServiceV1Beta1Stub.java b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/GrpcBinauthzManagementServiceV1Beta1Stub.java
index 9d6d8f6c..1a27b55a 100644
--- a/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/GrpcBinauthzManagementServiceV1Beta1Stub.java
+++ b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/GrpcBinauthzManagementServiceV1Beta1Stub.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.binaryauthorization.v1beta1.Attestor;
 import com.google.cloud.binaryauthorization.v1beta1.CreateAttestorRequest;
@@ -42,7 +41,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;
 
@@ -188,91 +186,70 @@ protected GrpcBinauthzManagementServiceV1Beta1Stub(
         GrpcCallSettings.<GetPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(getPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetPolicyRequest 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<UpdatePolicyRequest, Policy> updatePolicyTransportSettings =
         GrpcCallSettings.<UpdatePolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(updatePolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdatePolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdatePolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("policy.name", String.valueOf(request.getPolicy().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("policy.name", String.valueOf(request.getPolicy().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreateAttestorRequest, Attestor> createAttestorTransportSettings =
         GrpcCallSettings.<CreateAttestorRequest, Attestor>newBuilder()
             .setMethodDescriptor(createAttestorMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateAttestorRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateAttestorRequest 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<GetAttestorRequest, Attestor> getAttestorTransportSettings =
         GrpcCallSettings.<GetAttestorRequest, Attestor>newBuilder()
             .setMethodDescriptor(getAttestorMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetAttestorRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetAttestorRequest 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<UpdateAttestorRequest, Attestor> updateAttestorTransportSettings =
         GrpcCallSettings.<UpdateAttestorRequest, Attestor>newBuilder()
             .setMethodDescriptor(updateAttestorMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateAttestorRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateAttestorRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("attestor.name", String.valueOf(request.getAttestor().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("attestor.name", String.valueOf(request.getAttestor().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListAttestorsRequest, ListAttestorsResponse> listAttestorsTransportSettings =
         GrpcCallSettings.<ListAttestorsRequest, ListAttestorsResponse>newBuilder()
             .setMethodDescriptor(listAttestorsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListAttestorsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListAttestorsRequest 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<DeleteAttestorRequest, Empty> deleteAttestorTransportSettings =
         GrpcCallSettings.<DeleteAttestorRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteAttestorMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteAttestorRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteAttestorRequest 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();
 
@@ -352,7 +329,13 @@ public UnaryCallable<DeleteAttestorRequest, Empty> deleteAttestorCallable() {
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Policy.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Policy.java
index bf0c612f..c8e61918 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Policy.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Policy.java
@@ -230,7 +230,7 @@ public enum GlobalPolicyEvaluationMode implements com.google.protobuf.ProtocolMe
      *
      *
      * <pre>
-     * Enables global policy evaluation.
+     * Enables system policy evaluation.
      * </pre>
      *
      * <code>ENABLE = 1;</code>
@@ -240,7 +240,7 @@ public enum GlobalPolicyEvaluationMode implements com.google.protobuf.ProtocolMe
      *
      *
      * <pre>
-     * Disables global policy evaluation.
+     * Disables system policy evaluation.
      * </pre>
      *
      * <code>DISABLE = 2;</code>
@@ -263,7 +263,7 @@ public enum GlobalPolicyEvaluationMode implements com.google.protobuf.ProtocolMe
      *
      *
      * <pre>
-     * Enables global policy evaluation.
+     * Enables system policy evaluation.
      * </pre>
      *
      * <code>ENABLE = 1;</code>
@@ -273,7 +273,7 @@ public enum GlobalPolicyEvaluationMode implements com.google.protobuf.ProtocolMe
      *
      *
      * <pre>
-     * Disables global policy evaluation.
+     * Disables system policy evaluation.
      * </pre>
      *
      * <code>DISABLE = 2;</code>
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/proto/google/cloud/binaryauthorization/v1beta1/resources.proto b/proto-google-cloud-binary-authorization-v1beta1/src/main/proto/google/cloud/binaryauthorization/v1beta1/resources.proto
index ea674a7c..b596df9b 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/proto/google/cloud/binaryauthorization/v1beta1/resources.proto
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/proto/google/cloud/binaryauthorization/v1beta1/resources.proto
@@ -43,10 +43,10 @@ message Policy {
     // Not specified: DISABLE is assumed.
     GLOBAL_POLICY_EVALUATION_MODE_UNSPECIFIED = 0;
 
-    // Enables global policy evaluation.
+    // Enables system policy evaluation.
     ENABLE = 1;
 
-    // Disables global policy evaluation.
+    // Disables system policy evaluation.
     DISABLE = 2;
   }