diff --git a/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudBillingClient.java b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudBillingClient.java
index fd9640bb..e92d5d9a 100644
--- a/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudBillingClient.java
+++ b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudBillingClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.billing.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;
@@ -1349,12 +1348,7 @@ public static ApiFuture<ListBillingAccountsPagedResponse> createAsync(
           ListBillingAccountsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListBillingAccountsPage, ListBillingAccountsPagedResponse>() {
-            @Override
-            public ListBillingAccountsPagedResponse apply(ListBillingAccountsPage input) {
-              return new ListBillingAccountsPagedResponse(input);
-            }
-          },
+          input -> new ListBillingAccountsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -1439,12 +1433,7 @@ public static ApiFuture<ListProjectBillingInfoPagedResponse> createAsync(
           ListProjectBillingInfoPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListProjectBillingInfoPage, ListProjectBillingInfoPagedResponse>() {
-            @Override
-            public ListProjectBillingInfoPagedResponse apply(ListProjectBillingInfoPage input) {
-              return new ListProjectBillingInfoPagedResponse(input);
-            }
-          },
+          input -> new ListProjectBillingInfoPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudBillingSettings.java b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudBillingSettings.java
index 4bbefebe..e6cf7e2a 100644
--- a/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudBillingSettings.java
+++ b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudBillingSettings.java
@@ -220,14 +220,13 @@ public CloudBillingStubSettings.Builder getStubSettingsBuilder() {
       return ((CloudBillingStubSettings.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-billing/src/main/java/com/google/cloud/billing/v1/CloudCatalogClient.java b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudCatalogClient.java
index f910d7c5..1ad79923 100644
--- a/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudCatalogClient.java
+++ b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudCatalogClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.billing.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;
@@ -442,12 +441,7 @@ public static ApiFuture<ListServicesPagedResponse> createAsync(
           ListServicesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListServicesPage, ListServicesPagedResponse>() {
-            @Override
-            public ListServicesPagedResponse apply(ListServicesPage input) {
-              return new ListServicesPagedResponse(input);
-            }
-          },
+          input -> new ListServicesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -517,14 +511,7 @@ public static ApiFuture<ListSkusPagedResponse> createAsync(
       ApiFuture<ListSkusPage> futurePage =
           ListSkusPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListSkusPage, ListSkusPagedResponse>() {
-            @Override
-            public ListSkusPagedResponse apply(ListSkusPage input) {
-              return new ListSkusPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListSkusPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListSkusPagedResponse(ListSkusPage page) {
diff --git a/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudCatalogSettings.java b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudCatalogSettings.java
index 66b332a0..ff901a71 100644
--- a/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudCatalogSettings.java
+++ b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/CloudCatalogSettings.java
@@ -166,14 +166,13 @@ public CloudCatalogStubSettings.Builder getStubSettingsBuilder() {
       return ((CloudCatalogStubSettings.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-billing/src/main/java/com/google/cloud/billing/v1/stub/CloudBillingStubSettings.java b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/stub/CloudBillingStubSettings.java
index 5548a87b..4f9e0a4b 100644
--- a/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/stub/CloudBillingStubSettings.java
+++ b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/stub/CloudBillingStubSettings.java
@@ -605,14 +605,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-billing/src/main/java/com/google/cloud/billing/v1/stub/CloudCatalogStubSettings.java b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/stub/CloudCatalogStubSettings.java
index dc71684e..74406218 100644
--- a/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/stub/CloudCatalogStubSettings.java
+++ b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/stub/CloudCatalogStubSettings.java
@@ -383,14 +383,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-billing/src/main/java/com/google/cloud/billing/v1/stub/GrpcCloudBillingStub.java b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/stub/GrpcCloudBillingStub.java
index 6c489014..44229f59 100644
--- a/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/stub/GrpcCloudBillingStub.java
+++ b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/stub/GrpcCloudBillingStub.java
@@ -24,7 +24,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.billing.v1.BillingAccount;
 import com.google.cloud.billing.v1.CreateBillingAccountRequest;
@@ -47,7 +46,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;
 
@@ -228,13 +226,10 @@ protected GrpcCloudBillingStub(
         GrpcCallSettings.<GetBillingAccountRequest, BillingAccount>newBuilder()
             .setMethodDescriptor(getBillingAccountMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetBillingAccountRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetBillingAccountRequest 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<ListBillingAccountsRequest, ListBillingAccountsResponse>
@@ -247,13 +242,10 @@ public Map<String, String> extract(GetBillingAccountRequest request) {
             GrpcCallSettings.<UpdateBillingAccountRequest, BillingAccount>newBuilder()
                 .setMethodDescriptor(updateBillingAccountMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UpdateBillingAccountRequest>() {
-                      @Override
-                      public Map<String, String> extract(UpdateBillingAccountRequest 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<CreateBillingAccountRequest, BillingAccount>
@@ -267,13 +259,10 @@ public Map<String, String> extract(UpdateBillingAccountRequest request) {
                 .<ListProjectBillingInfoRequest, ListProjectBillingInfoResponse>newBuilder()
                 .setMethodDescriptor(listProjectBillingInfoMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListProjectBillingInfoRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListProjectBillingInfoRequest 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<GetProjectBillingInfoRequest, ProjectBillingInfo>
@@ -281,13 +270,10 @@ public Map<String, String> extract(ListProjectBillingInfoRequest request) {
             GrpcCallSettings.<GetProjectBillingInfoRequest, ProjectBillingInfo>newBuilder()
                 .setMethodDescriptor(getProjectBillingInfoMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetProjectBillingInfoRequest>() {
-                      @Override
-                      public Map<String, String> extract(GetProjectBillingInfoRequest 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<UpdateProjectBillingInfoRequest, ProjectBillingInfo>
@@ -295,39 +281,30 @@ public Map<String, String> extract(GetProjectBillingInfoRequest request) {
             GrpcCallSettings.<UpdateProjectBillingInfoRequest, ProjectBillingInfo>newBuilder()
                 .setMethodDescriptor(updateProjectBillingInfoMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UpdateProjectBillingInfoRequest>() {
-                      @Override
-                      public Map<String, String> extract(UpdateProjectBillingInfoRequest 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<GetIamPolicyRequest, Policy> getIamPolicyTransportSettings =
         GrpcCallSettings.<GetIamPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(getIamPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetIamPolicyRequest, Policy> setIamPolicyTransportSettings =
         GrpcCallSettings.<SetIamPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(setIamPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<TestIamPermissionsRequest, TestIamPermissionsResponse>
@@ -335,13 +312,10 @@ public Map<String, String> extract(SetIamPolicyRequest request) {
             GrpcCallSettings.<TestIamPermissionsRequest, TestIamPermissionsResponse>newBuilder()
                 .setMethodDescriptor(testIamPermissionsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<TestIamPermissionsRequest>() {
-                      @Override
-                      public Map<String, String> extract(TestIamPermissionsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("resource", String.valueOf(request.getResource()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("resource", String.valueOf(request.getResource()));
+                      return params.build();
                     })
                 .build();
 
diff --git a/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/stub/GrpcCloudCatalogStub.java b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/stub/GrpcCloudCatalogStub.java
index 3d2d3dc6..f9c5194a 100644
--- a/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/stub/GrpcCloudCatalogStub.java
+++ b/google-cloud-billing/src/main/java/com/google/cloud/billing/v1/stub/GrpcCloudCatalogStub.java
@@ -24,7 +24,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.billing.v1.ListServicesRequest;
 import com.google.cloud.billing.v1.ListServicesResponse;
@@ -35,7 +34,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;
 
@@ -122,13 +120,10 @@ protected GrpcCloudCatalogStub(
         GrpcCallSettings.<ListSkusRequest, ListSkusResponse>newBuilder()
             .setMethodDescriptor(listSkusMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListSkusRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListSkusRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
 
diff --git a/proto-google-cloud-billing-v1/clirr-ignored-differences.xml b/proto-google-cloud-billing-v1/clirr-ignored-differences.xml
index d872b9c9..d23e365c 100644
--- a/proto-google-cloud-billing-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-billing-v1/clirr-ignored-differences.xml
@@ -16,4 +16,8 @@
     <className>com/google/cloud/billing/v1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/billing/v1/SkuName*</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-billing-v1/src/main/java/com/google/cloud/billing/v1/SkuName.java b/proto-google-cloud-billing-v1/src/main/java/com/google/cloud/billing/v1/SkuName.java
deleted file mode 100644
index f22de89d..00000000
--- a/proto-google-cloud-billing-v1/src/main/java/com/google/cloud/billing/v1/SkuName.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.cloud.billing.v1;
-
-import com.google.api.pathtemplate.PathTemplate;
-import com.google.api.resourcenames.ResourceName;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import javax.annotation.Generated;
-
-// AUTO-GENERATED DOCUMENTATION AND CLASS.
-@Generated("by gapic-generator-java")
-public class SkuName implements ResourceName {
-  private static final PathTemplate SERVICE_SKU =
-      PathTemplate.createWithoutUrlEncoding("services/{service}/skus/{sku}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String service;
-  private final String sku;
-
-  @Deprecated
-  protected SkuName() {
-    service = null;
-    sku = null;
-  }
-
-  private SkuName(Builder builder) {
-    service = Preconditions.checkNotNull(builder.getService());
-    sku = Preconditions.checkNotNull(builder.getSku());
-  }
-
-  public String getService() {
-    return service;
-  }
-
-  public String getSku() {
-    return sku;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static SkuName of(String service, String sku) {
-    return newBuilder().setService(service).setSku(sku).build();
-  }
-
-  public static String format(String service, String sku) {
-    return newBuilder().setService(service).setSku(sku).build().toString();
-  }
-
-  public static SkuName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        SERVICE_SKU.validatedMatch(
-            formattedString, "SkuName.parse: formattedString not in valid format");
-    return of(matchMap.get("service"), matchMap.get("sku"));
-  }
-
-  public static List<SkuName> parseList(List<String> formattedStrings) {
-    List<SkuName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<SkuName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (SkuName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return SERVICE_SKU.matches(formattedString);
-  }
-
-  @Override
-  public Map<String, String> getFieldValuesMap() {
-    if (fieldValuesMap == null) {
-      synchronized (this) {
-        if (fieldValuesMap == null) {
-          ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
-          if (service != null) {
-            fieldMapBuilder.put("service", service);
-          }
-          if (sku != null) {
-            fieldMapBuilder.put("sku", sku);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return SERVICE_SKU.instantiate("service", service, "sku", sku);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      SkuName that = ((SkuName) o);
-      return Objects.equals(this.service, that.service) && Objects.equals(this.sku, that.sku);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= Objects.hashCode(service);
-    h *= 1000003;
-    h ^= Objects.hashCode(sku);
-    return h;
-  }
-
-  /** Builder for services/{service}/skus/{sku}. */
-  public static class Builder {
-    private String service;
-    private String sku;
-
-    protected Builder() {}
-
-    public String getService() {
-      return service;
-    }
-
-    public String getSku() {
-      return sku;
-    }
-
-    public Builder setService(String service) {
-      this.service = service;
-      return this;
-    }
-
-    public Builder setSku(String sku) {
-      this.sku = sku;
-      return this;
-    }
-
-    private Builder(SkuName skuName) {
-      this.service = skuName.service;
-      this.sku = skuName.sku;
-    }
-
-    public SkuName build() {
-      return new SkuName(this);
-    }
-  }
-}