diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java
index df14ac406..17160ba9d 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java
@@ -193,14 +193,13 @@ public ImageAnnotatorStubSettings.Builder getStubSettingsBuilder() {
       return ((ImageAnnotatorStubSettings.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-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java
index 634b7b70e..5ecec5677 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.vision.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;
@@ -3300,12 +3299,7 @@ public static ApiFuture<ListProductSetsPagedResponse> createAsync(
           ListProductSetsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListProductSetsPage, ListProductSetsPagedResponse>() {
-            @Override
-            public ListProductSetsPagedResponse apply(ListProductSetsPage input) {
-              return new ListProductSetsPagedResponse(input);
-            }
-          },
+          input -> new ListProductSetsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -3382,12 +3376,7 @@ public static ApiFuture<ListProductsPagedResponse> createAsync(
           ListProductsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListProductsPage, ListProductsPagedResponse>() {
-            @Override
-            public ListProductsPagedResponse apply(ListProductsPage input) {
-              return new ListProductsPagedResponse(input);
-            }
-          },
+          input -> new ListProductsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -3463,12 +3452,7 @@ public static ApiFuture<ListReferenceImagesPagedResponse> createAsync(
           ListReferenceImagesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListReferenceImagesPage, ListReferenceImagesPagedResponse>() {
-            @Override
-            public ListReferenceImagesPagedResponse apply(ListReferenceImagesPage input) {
-              return new ListReferenceImagesPagedResponse(input);
-            }
-          },
+          input -> new ListReferenceImagesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -3552,12 +3536,7 @@ public static ApiFuture<ListProductsInProductSetPagedResponse> createAsync(
           ListProductsInProductSetPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListProductsInProductSetPage, ListProductsInProductSetPagedResponse>() {
-            @Override
-            public ListProductsInProductSetPagedResponse apply(ListProductsInProductSetPage input) {
-              return new ListProductsInProductSetPagedResponse(input);
-            }
-          },
+          input -> new ListProductsInProductSetPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchSettings.java
index a42d214be..e6dc55fe6 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchSettings.java
@@ -278,14 +278,13 @@ public ProductSearchStubSettings.Builder getStubSettingsBuilder() {
       return ((ProductSearchStubSettings.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-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java
index 0d9a56a6f..6eff5ee22 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java
@@ -22,7 +22,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.vision.v1.AsyncBatchAnnotateFilesRequest;
 import com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse;
@@ -39,7 +38,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;
 
@@ -157,13 +155,10 @@ protected GrpcImageAnnotatorStub(
             GrpcCallSettings.<BatchAnnotateImagesRequest, BatchAnnotateImagesResponse>newBuilder()
                 .setMethodDescriptor(batchAnnotateImagesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<BatchAnnotateImagesRequest>() {
-                      @Override
-                      public Map<String, String> extract(BatchAnnotateImagesRequest 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<BatchAnnotateFilesRequest, BatchAnnotateFilesResponse>
@@ -171,13 +166,10 @@ public Map<String, String> extract(BatchAnnotateImagesRequest request) {
             GrpcCallSettings.<BatchAnnotateFilesRequest, BatchAnnotateFilesResponse>newBuilder()
                 .setMethodDescriptor(batchAnnotateFilesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<BatchAnnotateFilesRequest>() {
-                      @Override
-                      public Map<String, String> extract(BatchAnnotateFilesRequest 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<AsyncBatchAnnotateImagesRequest, Operation>
@@ -185,13 +177,10 @@ public Map<String, String> extract(BatchAnnotateFilesRequest request) {
             GrpcCallSettings.<AsyncBatchAnnotateImagesRequest, Operation>newBuilder()
                 .setMethodDescriptor(asyncBatchAnnotateImagesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<AsyncBatchAnnotateImagesRequest>() {
-                      @Override
-                      public Map<String, String> extract(AsyncBatchAnnotateImagesRequest 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<AsyncBatchAnnotateFilesRequest, Operation>
@@ -199,13 +188,10 @@ public Map<String, String> extract(AsyncBatchAnnotateImagesRequest request) {
             GrpcCallSettings.<AsyncBatchAnnotateFilesRequest, Operation>newBuilder()
                 .setMethodDescriptor(asyncBatchAnnotateFilesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<AsyncBatchAnnotateFilesRequest>() {
-                      @Override
-                      public Map<String, String> extract(AsyncBatchAnnotateFilesRequest 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();
 
@@ -290,7 +276,13 @@ public GrpcOperationsStub getOperationsStub() {
 
   @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/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcProductSearchStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcProductSearchStub.java
index 260d33659..5eaac41fc 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcProductSearchStub.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcProductSearchStub.java
@@ -27,7 +27,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.vision.v1.AddProductToProductSetRequest;
 import com.google.cloud.vision.v1.BatchOperationMetadata;
@@ -64,7 +63,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;
 
@@ -352,13 +350,10 @@ protected GrpcProductSearchStub(
         GrpcCallSettings.<CreateProductSetRequest, ProductSet>newBuilder()
             .setMethodDescriptor(createProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateProductSetRequest 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<ListProductSetsRequest, ListProductSetsResponse>
@@ -366,118 +361,90 @@ public Map<String, String> extract(CreateProductSetRequest request) {
             GrpcCallSettings.<ListProductSetsRequest, ListProductSetsResponse>newBuilder()
                 .setMethodDescriptor(listProductSetsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListProductSetsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListProductSetsRequest 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<GetProductSetRequest, ProductSet> getProductSetTransportSettings =
         GrpcCallSettings.<GetProductSetRequest, ProductSet>newBuilder()
             .setMethodDescriptor(getProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetProductSetRequest 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<UpdateProductSetRequest, ProductSet> updateProductSetTransportSettings =
         GrpcCallSettings.<UpdateProductSetRequest, ProductSet>newBuilder()
             .setMethodDescriptor(updateProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateProductSetRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put(
-                        "product_set.name", String.valueOf(request.getProductSet().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("product_set.name", String.valueOf(request.getProductSet().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteProductSetRequest, Empty> deleteProductSetTransportSettings =
         GrpcCallSettings.<DeleteProductSetRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteProductSetRequest 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<CreateProductRequest, Product> createProductTransportSettings =
         GrpcCallSettings.<CreateProductRequest, Product>newBuilder()
             .setMethodDescriptor(createProductMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateProductRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateProductRequest 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<ListProductsRequest, ListProductsResponse> listProductsTransportSettings =
         GrpcCallSettings.<ListProductsRequest, ListProductsResponse>newBuilder()
             .setMethodDescriptor(listProductsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListProductsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListProductsRequest 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<GetProductRequest, Product> getProductTransportSettings =
         GrpcCallSettings.<GetProductRequest, Product>newBuilder()
             .setMethodDescriptor(getProductMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetProductRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetProductRequest 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<UpdateProductRequest, Product> updateProductTransportSettings =
         GrpcCallSettings.<UpdateProductRequest, Product>newBuilder()
             .setMethodDescriptor(updateProductMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateProductRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateProductRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("product.name", String.valueOf(request.getProduct().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("product.name", String.valueOf(request.getProduct().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteProductRequest, Empty> deleteProductTransportSettings =
         GrpcCallSettings.<DeleteProductRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteProductMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteProductRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteProductRequest 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<CreateReferenceImageRequest, ReferenceImage>
@@ -485,26 +452,20 @@ public Map<String, String> extract(DeleteProductRequest request) {
             GrpcCallSettings.<CreateReferenceImageRequest, ReferenceImage>newBuilder()
                 .setMethodDescriptor(createReferenceImageMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreateReferenceImageRequest>() {
-                      @Override
-                      public Map<String, String> extract(CreateReferenceImageRequest 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<DeleteReferenceImageRequest, Empty> deleteReferenceImageTransportSettings =
         GrpcCallSettings.<DeleteReferenceImageRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteReferenceImageMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteReferenceImageRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteReferenceImageRequest 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<ListReferenceImagesRequest, ListReferenceImagesResponse>
@@ -512,39 +473,30 @@ public Map<String, String> extract(DeleteReferenceImageRequest request) {
             GrpcCallSettings.<ListReferenceImagesRequest, ListReferenceImagesResponse>newBuilder()
                 .setMethodDescriptor(listReferenceImagesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListReferenceImagesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListReferenceImagesRequest 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<GetReferenceImageRequest, ReferenceImage> getReferenceImageTransportSettings =
         GrpcCallSettings.<GetReferenceImageRequest, ReferenceImage>newBuilder()
             .setMethodDescriptor(getReferenceImageMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetReferenceImageRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetReferenceImageRequest 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<AddProductToProductSetRequest, Empty> addProductToProductSetTransportSettings =
         GrpcCallSettings.<AddProductToProductSetRequest, Empty>newBuilder()
             .setMethodDescriptor(addProductToProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<AddProductToProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(AddProductToProductSetRequest 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<RemoveProductFromProductSetRequest, Empty>
@@ -552,14 +504,10 @@ public Map<String, String> extract(AddProductToProductSetRequest request) {
             GrpcCallSettings.<RemoveProductFromProductSetRequest, Empty>newBuilder()
                 .setMethodDescriptor(removeProductFromProductSetMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<RemoveProductFromProductSetRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          RemoveProductFromProductSetRequest 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<ListProductsInProductSetRequest, ListProductsInProductSetResponse>
@@ -568,39 +516,30 @@ public Map<String, String> extract(
                 .<ListProductsInProductSetRequest, ListProductsInProductSetResponse>newBuilder()
                 .setMethodDescriptor(listProductsInProductSetMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListProductsInProductSetRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListProductsInProductSetRequest 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<ImportProductSetsRequest, Operation> importProductSetsTransportSettings =
         GrpcCallSettings.<ImportProductSetsRequest, Operation>newBuilder()
             .setMethodDescriptor(importProductSetsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ImportProductSetsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ImportProductSetsRequest 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<PurgeProductsRequest, Operation> purgeProductsTransportSettings =
         GrpcCallSettings.<PurgeProductsRequest, Operation>newBuilder()
             .setMethodDescriptor(purgeProductsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<PurgeProductsRequest>() {
-                  @Override
-                  public Map<String, String> extract(PurgeProductsRequest 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();
 
@@ -850,7 +789,13 @@ public UnaryCallable<PurgeProductsRequest, Operation> purgeProductsCallable() {
 
   @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/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java
index 9ec3cc875..8681b4bcc 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java
@@ -412,14 +412,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-vision/src/main/java/com/google/cloud/vision/v1/stub/ProductSearchStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ProductSearchStubSettings.java
index d8fc18247..f809d2ac4 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ProductSearchStubSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ProductSearchStubSettings.java
@@ -982,14 +982,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-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java
index 03965d482..167e721b9 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java
@@ -158,14 +158,13 @@ public ImageAnnotatorStubSettings.Builder getStubSettingsBuilder() {
       return ((ImageAnnotatorStubSettings.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-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java
index 2579fd8c1..251f45c95 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java
@@ -127,7 +127,13 @@ public GrpcOperationsStub getOperationsStub() {
 
   @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/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java
index daadc1a09..68ea7e3e8 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java
@@ -253,14 +253,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-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java
index 1ea4e1c1b..5a01dcec9 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java
@@ -174,14 +174,13 @@ public ImageAnnotatorStubSettings.Builder getStubSettingsBuilder() {
       return ((ImageAnnotatorStubSettings.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-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java
index d4ec7b72d..7a2f78b4a 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java
@@ -177,7 +177,13 @@ public GrpcOperationsStub getOperationsStub() {
 
   @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/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java
index c6851e9dd..bbec54696 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java
@@ -324,14 +324,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-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorSettings.java
index e1a75a263..0d72ff62b 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorSettings.java
@@ -174,14 +174,13 @@ public ImageAnnotatorStubSettings.Builder getStubSettingsBuilder() {
       return ((ImageAnnotatorStubSettings.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-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchClient.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchClient.java
index 3f091dd4d..aa2c72308 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchClient.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.vision.v1p3beta1;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -2987,12 +2986,7 @@ public static ApiFuture<ListProductSetsPagedResponse> createAsync(
           ListProductSetsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListProductSetsPage, ListProductSetsPagedResponse>() {
-            @Override
-            public ListProductSetsPagedResponse apply(ListProductSetsPage input) {
-              return new ListProductSetsPagedResponse(input);
-            }
-          },
+          input -> new ListProductSetsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -3069,12 +3063,7 @@ public static ApiFuture<ListProductsPagedResponse> createAsync(
           ListProductsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListProductsPage, ListProductsPagedResponse>() {
-            @Override
-            public ListProductsPagedResponse apply(ListProductsPage input) {
-              return new ListProductsPagedResponse(input);
-            }
-          },
+          input -> new ListProductsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -3150,12 +3139,7 @@ public static ApiFuture<ListReferenceImagesPagedResponse> createAsync(
           ListReferenceImagesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListReferenceImagesPage, ListReferenceImagesPagedResponse>() {
-            @Override
-            public ListReferenceImagesPagedResponse apply(ListReferenceImagesPage input) {
-              return new ListReferenceImagesPagedResponse(input);
-            }
-          },
+          input -> new ListReferenceImagesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -3239,12 +3223,7 @@ public static ApiFuture<ListProductsInProductSetPagedResponse> createAsync(
           ListProductsInProductSetPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListProductsInProductSetPage, ListProductsInProductSetPagedResponse>() {
-            @Override
-            public ListProductsInProductSetPagedResponse apply(ListProductsInProductSetPage input) {
-              return new ListProductsInProductSetPagedResponse(input);
-            }
-          },
+          input -> new ListProductsInProductSetPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchSettings.java
index bbc6ed14d..270cd78be 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchSettings.java
@@ -268,14 +268,13 @@ public ProductSearchStubSettings.Builder getStubSettingsBuilder() {
       return ((ProductSearchStubSettings.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-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcImageAnnotatorStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcImageAnnotatorStub.java
index a569566d0..b4044b61e 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcImageAnnotatorStub.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcImageAnnotatorStub.java
@@ -177,7 +177,13 @@ public GrpcOperationsStub getOperationsStub() {
 
   @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/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcProductSearchStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcProductSearchStub.java
index 3569f2903..7943bb7d5 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcProductSearchStub.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcProductSearchStub.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.vision.v1p3beta1.AddProductToProductSetRequest;
 import com.google.cloud.vision.v1p3beta1.BatchOperationMetadata;
@@ -64,7 +63,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;
 
@@ -343,13 +341,10 @@ protected GrpcProductSearchStub(
         GrpcCallSettings.<CreateProductSetRequest, ProductSet>newBuilder()
             .setMethodDescriptor(createProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateProductSetRequest 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<ListProductSetsRequest, ListProductSetsResponse>
@@ -357,118 +352,90 @@ public Map<String, String> extract(CreateProductSetRequest request) {
             GrpcCallSettings.<ListProductSetsRequest, ListProductSetsResponse>newBuilder()
                 .setMethodDescriptor(listProductSetsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListProductSetsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListProductSetsRequest 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<GetProductSetRequest, ProductSet> getProductSetTransportSettings =
         GrpcCallSettings.<GetProductSetRequest, ProductSet>newBuilder()
             .setMethodDescriptor(getProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetProductSetRequest 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<UpdateProductSetRequest, ProductSet> updateProductSetTransportSettings =
         GrpcCallSettings.<UpdateProductSetRequest, ProductSet>newBuilder()
             .setMethodDescriptor(updateProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateProductSetRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put(
-                        "product_set.name", String.valueOf(request.getProductSet().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("product_set.name", String.valueOf(request.getProductSet().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteProductSetRequest, Empty> deleteProductSetTransportSettings =
         GrpcCallSettings.<DeleteProductSetRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteProductSetRequest 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<CreateProductRequest, Product> createProductTransportSettings =
         GrpcCallSettings.<CreateProductRequest, Product>newBuilder()
             .setMethodDescriptor(createProductMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateProductRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateProductRequest 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<ListProductsRequest, ListProductsResponse> listProductsTransportSettings =
         GrpcCallSettings.<ListProductsRequest, ListProductsResponse>newBuilder()
             .setMethodDescriptor(listProductsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListProductsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListProductsRequest 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<GetProductRequest, Product> getProductTransportSettings =
         GrpcCallSettings.<GetProductRequest, Product>newBuilder()
             .setMethodDescriptor(getProductMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetProductRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetProductRequest 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<UpdateProductRequest, Product> updateProductTransportSettings =
         GrpcCallSettings.<UpdateProductRequest, Product>newBuilder()
             .setMethodDescriptor(updateProductMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateProductRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateProductRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("product.name", String.valueOf(request.getProduct().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("product.name", String.valueOf(request.getProduct().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteProductRequest, Empty> deleteProductTransportSettings =
         GrpcCallSettings.<DeleteProductRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteProductMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteProductRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteProductRequest 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<CreateReferenceImageRequest, ReferenceImage>
@@ -476,26 +443,20 @@ public Map<String, String> extract(DeleteProductRequest request) {
             GrpcCallSettings.<CreateReferenceImageRequest, ReferenceImage>newBuilder()
                 .setMethodDescriptor(createReferenceImageMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreateReferenceImageRequest>() {
-                      @Override
-                      public Map<String, String> extract(CreateReferenceImageRequest 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<DeleteReferenceImageRequest, Empty> deleteReferenceImageTransportSettings =
         GrpcCallSettings.<DeleteReferenceImageRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteReferenceImageMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteReferenceImageRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteReferenceImageRequest 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<ListReferenceImagesRequest, ListReferenceImagesResponse>
@@ -503,39 +464,30 @@ public Map<String, String> extract(DeleteReferenceImageRequest request) {
             GrpcCallSettings.<ListReferenceImagesRequest, ListReferenceImagesResponse>newBuilder()
                 .setMethodDescriptor(listReferenceImagesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListReferenceImagesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListReferenceImagesRequest 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<GetReferenceImageRequest, ReferenceImage> getReferenceImageTransportSettings =
         GrpcCallSettings.<GetReferenceImageRequest, ReferenceImage>newBuilder()
             .setMethodDescriptor(getReferenceImageMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetReferenceImageRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetReferenceImageRequest 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<AddProductToProductSetRequest, Empty> addProductToProductSetTransportSettings =
         GrpcCallSettings.<AddProductToProductSetRequest, Empty>newBuilder()
             .setMethodDescriptor(addProductToProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<AddProductToProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(AddProductToProductSetRequest 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<RemoveProductFromProductSetRequest, Empty>
@@ -543,14 +495,10 @@ public Map<String, String> extract(AddProductToProductSetRequest request) {
             GrpcCallSettings.<RemoveProductFromProductSetRequest, Empty>newBuilder()
                 .setMethodDescriptor(removeProductFromProductSetMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<RemoveProductFromProductSetRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          RemoveProductFromProductSetRequest 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<ListProductsInProductSetRequest, ListProductsInProductSetResponse>
@@ -559,26 +507,20 @@ public Map<String, String> extract(
                 .<ListProductsInProductSetRequest, ListProductsInProductSetResponse>newBuilder()
                 .setMethodDescriptor(listProductsInProductSetMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListProductsInProductSetRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListProductsInProductSetRequest 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<ImportProductSetsRequest, Operation> importProductSetsTransportSettings =
         GrpcCallSettings.<ImportProductSetsRequest, Operation>newBuilder()
             .setMethodDescriptor(importProductSetsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ImportProductSetsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ImportProductSetsRequest 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();
 
@@ -808,7 +750,13 @@ public UnaryCallable<ImportProductSetsRequest, Operation> importProductSetsCalla
 
   @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/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ImageAnnotatorStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ImageAnnotatorStubSettings.java
index 4dce5c7b5..5acfa9bf5 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ImageAnnotatorStubSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ImageAnnotatorStubSettings.java
@@ -337,14 +337,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-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ProductSearchStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ProductSearchStubSettings.java
index ac35e3916..ff6b4bc8d 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ProductSearchStubSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ProductSearchStubSettings.java
@@ -928,14 +928,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-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ImageAnnotatorSettings.java
index 43afbf998..97a284097 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ImageAnnotatorSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ImageAnnotatorSettings.java
@@ -194,14 +194,13 @@ public ImageAnnotatorStubSettings.Builder getStubSettingsBuilder() {
       return ((ImageAnnotatorStubSettings.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-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchClient.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchClient.java
index 0fd275c4f..3b0f6569e 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchClient.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.vision.v1p4beta1;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -3105,12 +3104,7 @@ public static ApiFuture<ListProductSetsPagedResponse> createAsync(
           ListProductSetsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListProductSetsPage, ListProductSetsPagedResponse>() {
-            @Override
-            public ListProductSetsPagedResponse apply(ListProductSetsPage input) {
-              return new ListProductSetsPagedResponse(input);
-            }
-          },
+          input -> new ListProductSetsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -3187,12 +3181,7 @@ public static ApiFuture<ListProductsPagedResponse> createAsync(
           ListProductsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListProductsPage, ListProductsPagedResponse>() {
-            @Override
-            public ListProductsPagedResponse apply(ListProductsPage input) {
-              return new ListProductsPagedResponse(input);
-            }
-          },
+          input -> new ListProductsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -3268,12 +3257,7 @@ public static ApiFuture<ListReferenceImagesPagedResponse> createAsync(
           ListReferenceImagesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListReferenceImagesPage, ListReferenceImagesPagedResponse>() {
-            @Override
-            public ListReferenceImagesPagedResponse apply(ListReferenceImagesPage input) {
-              return new ListReferenceImagesPagedResponse(input);
-            }
-          },
+          input -> new ListReferenceImagesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -3357,12 +3341,7 @@ public static ApiFuture<ListProductsInProductSetPagedResponse> createAsync(
           ListProductsInProductSetPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListProductsInProductSetPage, ListProductsInProductSetPagedResponse>() {
-            @Override
-            public ListProductsInProductSetPagedResponse apply(ListProductsInProductSetPage input) {
-              return new ListProductsInProductSetPagedResponse(input);
-            }
-          },
+          input -> new ListProductsInProductSetPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchSettings.java
index b47b32fb9..e0ec4a1cf 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchSettings.java
@@ -279,14 +279,13 @@ public ProductSearchStubSettings.Builder getStubSettingsBuilder() {
       return ((ProductSearchStubSettings.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-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcImageAnnotatorStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcImageAnnotatorStub.java
index b642a5127..180a7ac35 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcImageAnnotatorStub.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcImageAnnotatorStub.java
@@ -255,7 +255,13 @@ public GrpcOperationsStub getOperationsStub() {
 
   @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/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcProductSearchStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcProductSearchStub.java
index 2ec3e6756..6e85bd3b4 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcProductSearchStub.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcProductSearchStub.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.vision.v1p4beta1.AddProductToProductSetRequest;
 import com.google.cloud.vision.v1p4beta1.BatchOperationMetadata;
@@ -65,7 +64,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;
 
@@ -357,13 +355,10 @@ protected GrpcProductSearchStub(
         GrpcCallSettings.<CreateProductSetRequest, ProductSet>newBuilder()
             .setMethodDescriptor(createProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateProductSetRequest 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<ListProductSetsRequest, ListProductSetsResponse>
@@ -371,118 +366,90 @@ public Map<String, String> extract(CreateProductSetRequest request) {
             GrpcCallSettings.<ListProductSetsRequest, ListProductSetsResponse>newBuilder()
                 .setMethodDescriptor(listProductSetsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListProductSetsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListProductSetsRequest 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<GetProductSetRequest, ProductSet> getProductSetTransportSettings =
         GrpcCallSettings.<GetProductSetRequest, ProductSet>newBuilder()
             .setMethodDescriptor(getProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetProductSetRequest 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<UpdateProductSetRequest, ProductSet> updateProductSetTransportSettings =
         GrpcCallSettings.<UpdateProductSetRequest, ProductSet>newBuilder()
             .setMethodDescriptor(updateProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateProductSetRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put(
-                        "product_set.name", String.valueOf(request.getProductSet().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("product_set.name", String.valueOf(request.getProductSet().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteProductSetRequest, Empty> deleteProductSetTransportSettings =
         GrpcCallSettings.<DeleteProductSetRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteProductSetRequest 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<CreateProductRequest, Product> createProductTransportSettings =
         GrpcCallSettings.<CreateProductRequest, Product>newBuilder()
             .setMethodDescriptor(createProductMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateProductRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateProductRequest 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<ListProductsRequest, ListProductsResponse> listProductsTransportSettings =
         GrpcCallSettings.<ListProductsRequest, ListProductsResponse>newBuilder()
             .setMethodDescriptor(listProductsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListProductsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListProductsRequest 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<GetProductRequest, Product> getProductTransportSettings =
         GrpcCallSettings.<GetProductRequest, Product>newBuilder()
             .setMethodDescriptor(getProductMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetProductRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetProductRequest 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<UpdateProductRequest, Product> updateProductTransportSettings =
         GrpcCallSettings.<UpdateProductRequest, Product>newBuilder()
             .setMethodDescriptor(updateProductMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateProductRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateProductRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("product.name", String.valueOf(request.getProduct().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("product.name", String.valueOf(request.getProduct().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteProductRequest, Empty> deleteProductTransportSettings =
         GrpcCallSettings.<DeleteProductRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteProductMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteProductRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteProductRequest 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<CreateReferenceImageRequest, ReferenceImage>
@@ -490,26 +457,20 @@ public Map<String, String> extract(DeleteProductRequest request) {
             GrpcCallSettings.<CreateReferenceImageRequest, ReferenceImage>newBuilder()
                 .setMethodDescriptor(createReferenceImageMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreateReferenceImageRequest>() {
-                      @Override
-                      public Map<String, String> extract(CreateReferenceImageRequest 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<DeleteReferenceImageRequest, Empty> deleteReferenceImageTransportSettings =
         GrpcCallSettings.<DeleteReferenceImageRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteReferenceImageMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteReferenceImageRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteReferenceImageRequest 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<ListReferenceImagesRequest, ListReferenceImagesResponse>
@@ -517,39 +478,30 @@ public Map<String, String> extract(DeleteReferenceImageRequest request) {
             GrpcCallSettings.<ListReferenceImagesRequest, ListReferenceImagesResponse>newBuilder()
                 .setMethodDescriptor(listReferenceImagesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListReferenceImagesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListReferenceImagesRequest 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<GetReferenceImageRequest, ReferenceImage> getReferenceImageTransportSettings =
         GrpcCallSettings.<GetReferenceImageRequest, ReferenceImage>newBuilder()
             .setMethodDescriptor(getReferenceImageMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetReferenceImageRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetReferenceImageRequest 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<AddProductToProductSetRequest, Empty> addProductToProductSetTransportSettings =
         GrpcCallSettings.<AddProductToProductSetRequest, Empty>newBuilder()
             .setMethodDescriptor(addProductToProductSetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<AddProductToProductSetRequest>() {
-                  @Override
-                  public Map<String, String> extract(AddProductToProductSetRequest 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<RemoveProductFromProductSetRequest, Empty>
@@ -557,14 +509,10 @@ public Map<String, String> extract(AddProductToProductSetRequest request) {
             GrpcCallSettings.<RemoveProductFromProductSetRequest, Empty>newBuilder()
                 .setMethodDescriptor(removeProductFromProductSetMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<RemoveProductFromProductSetRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          RemoveProductFromProductSetRequest 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<ListProductsInProductSetRequest, ListProductsInProductSetResponse>
@@ -573,39 +521,30 @@ public Map<String, String> extract(
                 .<ListProductsInProductSetRequest, ListProductsInProductSetResponse>newBuilder()
                 .setMethodDescriptor(listProductsInProductSetMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListProductsInProductSetRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListProductsInProductSetRequest 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<ImportProductSetsRequest, Operation> importProductSetsTransportSettings =
         GrpcCallSettings.<ImportProductSetsRequest, Operation>newBuilder()
             .setMethodDescriptor(importProductSetsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ImportProductSetsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ImportProductSetsRequest 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<PurgeProductsRequest, Operation> purgeProductsTransportSettings =
         GrpcCallSettings.<PurgeProductsRequest, Operation>newBuilder()
             .setMethodDescriptor(purgeProductsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<PurgeProductsRequest>() {
-                  @Override
-                  public Map<String, String> extract(PurgeProductsRequest 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();
 
@@ -855,7 +794,13 @@ public UnaryCallable<PurgeProductsRequest, Operation> purgeProductsCallable() {
 
   @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/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ImageAnnotatorStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ImageAnnotatorStubSettings.java
index 134dfe11b..9781ac9eb 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ImageAnnotatorStubSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ImageAnnotatorStubSettings.java
@@ -410,14 +410,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-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ProductSearchStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ProductSearchStubSettings.java
index 57875b9c5..c6690c103 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ProductSearchStubSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ProductSearchStubSettings.java
@@ -986,14 +986,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/synth.metadata b/synth.metadata
index bda9abc27..2b29e0fe0 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,47 +4,47 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-vision.git",
-        "sha": "5b4a665cd14dc35ceb630ed479898560d18c0243"
+        "sha": "2bae4cea7ead0a5a2b6b38d42b73e68074319ce7"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "551681f25e36b11829e87e580281350461f4f3f5",
-        "internalRef": "379784268"
+        "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48",
+        "internalRef": "388535346"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "551681f25e36b11829e87e580281350461f4f3f5",
-        "internalRef": "379784268"
+        "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48",
+        "internalRef": "388535346"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "551681f25e36b11829e87e580281350461f4f3f5",
-        "internalRef": "379784268"
+        "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48",
+        "internalRef": "388535346"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "551681f25e36b11829e87e580281350461f4f3f5",
-        "internalRef": "379784268"
+        "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48",
+        "internalRef": "388535346"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "551681f25e36b11829e87e580281350461f4f3f5",
-        "internalRef": "379784268"
+        "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48",
+        "internalRef": "388535346"
       }
     },
     {