diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceApi.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceApi.java
index e7e7b4a58e5a..54f8c59d819b 100644
--- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceApi.java
+++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceApi.java
@@ -96,9 +96,6 @@ public class ErrorGroupServiceApi implements AutoCloseable {
   private static final PathTemplate GROUP_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}/groups/{group}");
 
-  private static final PathTemplate PROJECT_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}");
-
   /** Formats a string containing the fully-qualified path to represent a group resource. */
   public static final String formatGroupName(String project, String group) {
     return GROUP_PATH_TEMPLATE.instantiate(
@@ -106,11 +103,6 @@ public static final String formatGroupName(String project, String group) {
         "group", group);
   }
 
-  /** Formats a string containing the fully-qualified path to represent a project resource. */
-  public static final String formatProjectName(String project) {
-    return PROJECT_PATH_TEMPLATE.instantiate("project", project);
-  }
-
   /** Parses the project from the given fully-qualified path which represents a group resource. */
   public static final String parseProjectFromGroupName(String groupName) {
     return GROUP_PATH_TEMPLATE.parse(groupName).get("project");
@@ -121,11 +113,6 @@ public static final String parseGroupFromGroupName(String groupName) {
     return GROUP_PATH_TEMPLATE.parse(groupName).get("group");
   }
 
-  /** Parses the project from the given fully-qualified path which represents a project resource. */
-  public static final String parseProjectFromProjectName(String projectName) {
-    return PROJECT_PATH_TEMPLATE.parse(projectName).get("project");
-  }
-
   /** Constructs an instance of ErrorGroupServiceApi with default settings. */
   public static final ErrorGroupServiceApi create() throws IOException {
     return create(ErrorGroupServiceSettings.defaultBuilder().build());
@@ -268,6 +255,7 @@ public final UnaryCallable<GetGroupRequest, ErrorGroup> getGroupCallable() {
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
   public final ErrorGroup updateGroup(ErrorGroup group) {
+
     UpdateGroupRequest request = UpdateGroupRequest.newBuilder().setGroup(group).build();
     return updateGroup(request);
   }
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceApi.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceApi.java
index 6111ce12228b..922b5e2482eb 100644
--- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceApi.java
+++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceApi.java
@@ -105,34 +105,14 @@ public class ErrorStatsServiceApi implements AutoCloseable {
   private final UnaryCallable<ListEventsRequest, ListEventsPagedResponse> listEventsPagedCallable;
   private final UnaryCallable<DeleteEventsRequest, DeleteEventsResponse> deleteEventsCallable;
 
-  private static final PathTemplate GROUP_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/groups/{group}");
-
   private static final PathTemplate PROJECT_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}");
 
-  /** Formats a string containing the fully-qualified path to represent a group resource. */
-  public static final String formatGroupName(String project, String group) {
-    return GROUP_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "group", group);
-  }
-
   /** Formats a string containing the fully-qualified path to represent a project resource. */
   public static final String formatProjectName(String project) {
     return PROJECT_PATH_TEMPLATE.instantiate("project", project);
   }
 
-  /** Parses the project from the given fully-qualified path which represents a group resource. */
-  public static final String parseProjectFromGroupName(String groupName) {
-    return GROUP_PATH_TEMPLATE.parse(groupName).get("project");
-  }
-
-  /** Parses the group from the given fully-qualified path which represents a group resource. */
-  public static final String parseGroupFromGroupName(String groupName) {
-    return GROUP_PATH_TEMPLATE.parse(groupName).get("group");
-  }
-
   /** Parses the project from the given fully-qualified path which represents a project resource. */
   public static final String parseProjectFromProjectName(String projectName) {
     return PROJECT_PATH_TEMPLATE.parse(projectName).get("project");
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceApi.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceApi.java
index 1f98f5c07213..c74a7f937df3 100644
--- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceApi.java
+++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceApi.java
@@ -95,34 +95,14 @@ public class ReportErrorsServiceApi implements AutoCloseable {
   private final UnaryCallable<ReportErrorEventRequest, ReportErrorEventResponse>
       reportErrorEventCallable;
 
-  private static final PathTemplate GROUP_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/groups/{group}");
-
   private static final PathTemplate PROJECT_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}");
 
-  /** Formats a string containing the fully-qualified path to represent a group resource. */
-  public static final String formatGroupName(String project, String group) {
-    return GROUP_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "group", group);
-  }
-
   /** Formats a string containing the fully-qualified path to represent a project resource. */
   public static final String formatProjectName(String project) {
     return PROJECT_PATH_TEMPLATE.instantiate("project", project);
   }
 
-  /** Parses the project from the given fully-qualified path which represents a group resource. */
-  public static final String parseProjectFromGroupName(String groupName) {
-    return GROUP_PATH_TEMPLATE.parse(groupName).get("project");
-  }
-
-  /** Parses the group from the given fully-qualified path which represents a group resource. */
-  public static final String parseGroupFromGroupName(String groupName) {
-    return GROUP_PATH_TEMPLATE.parse(groupName).get("group");
-  }
-
   /** Parses the project from the given fully-qualified path which represents a project resource. */
   public static final String parseProjectFromProjectName(String projectName) {
     return PROJECT_PATH_TEMPLATE.parse(projectName).get("project");
diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupService.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupService.java
index 1754d5bad907..eebc1db9642f 100644
--- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupService.java
+++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupService.java
@@ -43,7 +43,6 @@ public void addException(Exception exception) {
     serviceImpl.addException(exception);
   }
 
-  @Override
   public void setResponses(List<GeneratedMessageV3> responses) {
     serviceImpl.setResponses(responses);
   }
diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsService.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsService.java
index 2cab442bf318..2acc7112f214 100644
--- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsService.java
+++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsService.java
@@ -43,7 +43,6 @@ public void addException(Exception exception) {
     serviceImpl.addException(exception);
   }
 
-  @Override
   public void setResponses(List<GeneratedMessageV3> responses) {
     serviceImpl.setResponses(responses);
   }
diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsService.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsService.java
index a42fec1a9717..ff4007c77f55 100644
--- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsService.java
+++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsService.java
@@ -43,7 +43,6 @@ public void addException(Exception exception) {
     serviceImpl.addException(exception);
   }
 
-  @Override
   public void setResponses(List<GeneratedMessageV3> responses) {
     serviceImpl.setResponses(responses);
   }
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigServiceV2Api.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigServiceV2Api.java
index 0ae9bc516101..53722afe5f52 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigServiceV2Api.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigServiceV2Api.java
@@ -111,12 +111,6 @@ public class ConfigServiceV2Api implements AutoCloseable {
   private static final PathTemplate SINK_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}/sinks/{sink}");
 
-  private static final PathTemplate METRIC_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/metrics/{metric}");
-
-  private static final PathTemplate LOG_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/logs/{log}");
-
   /** Formats a string containing the fully-qualified path to represent a parent resource. */
   public static final String formatParentName(String project) {
     return PARENT_PATH_TEMPLATE.instantiate("project", project);
@@ -129,20 +123,6 @@ public static final String formatSinkName(String project, String sink) {
         "sink", sink);
   }
 
-  /** Formats a string containing the fully-qualified path to represent a metric resource. */
-  public static final String formatMetricName(String project, String metric) {
-    return METRIC_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "metric", metric);
-  }
-
-  /** Formats a string containing the fully-qualified path to represent a log resource. */
-  public static final String formatLogName(String project, String log) {
-    return LOG_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "log", log);
-  }
-
   /** Parses the project from the given fully-qualified path which represents a parent resource. */
   public static final String parseProjectFromParentName(String parentName) {
     return PARENT_PATH_TEMPLATE.parse(parentName).get("project");
@@ -158,26 +138,6 @@ public static final String parseSinkFromSinkName(String sinkName) {
     return SINK_PATH_TEMPLATE.parse(sinkName).get("sink");
   }
 
-  /** Parses the project from the given fully-qualified path which represents a metric resource. */
-  public static final String parseProjectFromMetricName(String metricName) {
-    return METRIC_PATH_TEMPLATE.parse(metricName).get("project");
-  }
-
-  /** Parses the metric from the given fully-qualified path which represents a metric resource. */
-  public static final String parseMetricFromMetricName(String metricName) {
-    return METRIC_PATH_TEMPLATE.parse(metricName).get("metric");
-  }
-
-  /** Parses the project from the given fully-qualified path which represents a log resource. */
-  public static final String parseProjectFromLogName(String logName) {
-    return LOG_PATH_TEMPLATE.parse(logName).get("project");
-  }
-
-  /** Parses the log from the given fully-qualified path which represents a log resource. */
-  public static final String parseLogFromLogName(String logName) {
-    return LOG_PATH_TEMPLATE.parse(logName).get("log");
-  }
-
   /** Constructs an instance of ConfigServiceV2Api with default settings. */
   public static final ConfigServiceV2Api create() throws IOException {
     return create(ConfigServiceV2Settings.defaultBuilder().build());
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Api.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Api.java
index 0630e0d87b45..ab4cd4991168 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Api.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Api.java
@@ -117,12 +117,6 @@ public class LoggingServiceV2Api implements AutoCloseable {
   private static final PathTemplate PARENT_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}");
 
-  private static final PathTemplate SINK_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/sinks/{sink}");
-
-  private static final PathTemplate METRIC_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/metrics/{metric}");
-
   private static final PathTemplate LOG_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}/logs/{log}");
 
@@ -131,20 +125,6 @@ public static final String formatParentName(String project) {
     return PARENT_PATH_TEMPLATE.instantiate("project", project);
   }
 
-  /** Formats a string containing the fully-qualified path to represent a sink resource. */
-  public static final String formatSinkName(String project, String sink) {
-    return SINK_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "sink", sink);
-  }
-
-  /** Formats a string containing the fully-qualified path to represent a metric resource. */
-  public static final String formatMetricName(String project, String metric) {
-    return METRIC_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "metric", metric);
-  }
-
   /** Formats a string containing the fully-qualified path to represent a log resource. */
   public static final String formatLogName(String project, String log) {
     return LOG_PATH_TEMPLATE.instantiate(
@@ -157,26 +137,6 @@ public static final String parseProjectFromParentName(String parentName) {
     return PARENT_PATH_TEMPLATE.parse(parentName).get("project");
   }
 
-  /** Parses the project from the given fully-qualified path which represents a sink resource. */
-  public static final String parseProjectFromSinkName(String sinkName) {
-    return SINK_PATH_TEMPLATE.parse(sinkName).get("project");
-  }
-
-  /** Parses the sink from the given fully-qualified path which represents a sink resource. */
-  public static final String parseSinkFromSinkName(String sinkName) {
-    return SINK_PATH_TEMPLATE.parse(sinkName).get("sink");
-  }
-
-  /** Parses the project from the given fully-qualified path which represents a metric resource. */
-  public static final String parseProjectFromMetricName(String metricName) {
-    return METRIC_PATH_TEMPLATE.parse(metricName).get("project");
-  }
-
-  /** Parses the metric from the given fully-qualified path which represents a metric resource. */
-  public static final String parseMetricFromMetricName(String metricName) {
-    return METRIC_PATH_TEMPLATE.parse(metricName).get("metric");
-  }
-
   /** Parses the project from the given fully-qualified path which represents a log resource. */
   public static final String parseProjectFromLogName(String logName) {
     return LOG_PATH_TEMPLATE.parse(logName).get("project");
@@ -428,19 +388,18 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *
    * <pre><code>
    * try (LoggingServiceV2Api loggingServiceV2Api = LoggingServiceV2Api.create()) {
-   *   List&lt;String&gt; projectIds = new ArrayList&lt;&gt;();
+   *   List&lt;String&gt; resourceNames = new ArrayList&lt;&gt;();
    *   String filter = "";
    *   String orderBy = "";
-   *   for (LogEntry element : loggingServiceV2Api.listLogEntries(projectIds, filter, orderBy).iterateAllElements()) {
+   *   for (LogEntry element : loggingServiceV2Api.listLogEntries(resourceNames, filter, orderBy).iterateAllElements()) {
    *     // doThingsWith(element);
    *   }
    * }
    * </code></pre>
    *
-   * @param projectIds Deprecated. One or more project identifiers or project numbers from which to
-   *     retrieve log entries. Examples: `"my-project-1A"`, `"1234567890"`. If present, these
-   *     project identifiers are converted to resource format and added to the list of resources in
-   *     `resourceNames`. Callers should use `resourceNames` rather than this parameter.
+   * @param resourceNames Optional. One or more cloud resources from which to retrieve log entries.
+   *     Example: `"projects/my-project-1A"`, `"projects/1234567890"`. Projects listed in
+   *     `projectIds` are added to this list.
    * @param filter Optional. A filter that chooses which log entries to return. See [Advanced Logs
    *     Filters](/logging/docs/view/advanced_filters). Only log entries that match the filter are
    *     returned. An empty filter matches all log entries.
@@ -452,10 +411,10 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
   public final ListLogEntriesPagedResponse listLogEntries(
-      List<String> projectIds, String filter, String orderBy) {
+      List<String> resourceNames, String filter, String orderBy) {
     ListLogEntriesRequest request =
         ListLogEntriesRequest.newBuilder()
-            .addAllProjectIds(projectIds)
+            .addAllResourceNames(resourceNames)
             .setFilter(filter)
             .setOrderBy(orderBy)
             .build();
@@ -471,9 +430,9 @@ public final ListLogEntriesPagedResponse listLogEntries(
    *
    * <pre><code>
    * try (LoggingServiceV2Api loggingServiceV2Api = LoggingServiceV2Api.create()) {
-   *   List&lt;String&gt; projectIds = new ArrayList&lt;&gt;();
+   *   List&lt;String&gt; resourceNames = new ArrayList&lt;&gt;();
    *   ListLogEntriesRequest request = ListLogEntriesRequest.newBuilder()
-   *     .addAllProjectIds(projectIds)
+   *     .addAllResourceNames(resourceNames)
    *     .build();
    *   for (LogEntry element : loggingServiceV2Api.listLogEntries(request).iterateAllElements()) {
    *     // doThingsWith(element);
@@ -497,9 +456,9 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *
    * <pre><code>
    * try (LoggingServiceV2Api loggingServiceV2Api = LoggingServiceV2Api.create()) {
-   *   List&lt;String&gt; projectIds = new ArrayList&lt;&gt;();
+   *   List&lt;String&gt; resourceNames = new ArrayList&lt;&gt;();
    *   ListLogEntriesRequest request = ListLogEntriesRequest.newBuilder()
-   *     .addAllProjectIds(projectIds)
+   *     .addAllResourceNames(resourceNames)
    *     .build();
    *   ListenableFuture&lt;ListLogEntriesPagedResponse&gt; future = loggingServiceV2Api.listLogEntriesPagedCallable().futureCall(request);
    *   // Do something
@@ -523,9 +482,9 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *
    * <pre><code>
    * try (LoggingServiceV2Api loggingServiceV2Api = LoggingServiceV2Api.create()) {
-   *   List&lt;String&gt; projectIds = new ArrayList&lt;&gt;();
+   *   List&lt;String&gt; resourceNames = new ArrayList&lt;&gt;();
    *   ListLogEntriesRequest request = ListLogEntriesRequest.newBuilder()
-   *     .addAllProjectIds(projectIds)
+   *     .addAllResourceNames(resourceNames)
    *     .build();
    *   while (true) {
    *     ListLogEntriesResponse response = loggingServiceV2Api.listLogEntriesCallable().call(request);
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsServiceV2Api.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsServiceV2Api.java
index 4beb54688c2b..cc0ea0b1a466 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsServiceV2Api.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsServiceV2Api.java
@@ -108,27 +108,14 @@ public class MetricsServiceV2Api implements AutoCloseable {
   private static final PathTemplate PARENT_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}");
 
-  private static final PathTemplate SINK_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/sinks/{sink}");
-
   private static final PathTemplate METRIC_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}/metrics/{metric}");
 
-  private static final PathTemplate LOG_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/logs/{log}");
-
   /** Formats a string containing the fully-qualified path to represent a parent resource. */
   public static final String formatParentName(String project) {
     return PARENT_PATH_TEMPLATE.instantiate("project", project);
   }
 
-  /** Formats a string containing the fully-qualified path to represent a sink resource. */
-  public static final String formatSinkName(String project, String sink) {
-    return SINK_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "sink", sink);
-  }
-
   /** Formats a string containing the fully-qualified path to represent a metric resource. */
   public static final String formatMetricName(String project, String metric) {
     return METRIC_PATH_TEMPLATE.instantiate(
@@ -136,28 +123,11 @@ public static final String formatMetricName(String project, String metric) {
         "metric", metric);
   }
 
-  /** Formats a string containing the fully-qualified path to represent a log resource. */
-  public static final String formatLogName(String project, String log) {
-    return LOG_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "log", log);
-  }
-
   /** Parses the project from the given fully-qualified path which represents a parent resource. */
   public static final String parseProjectFromParentName(String parentName) {
     return PARENT_PATH_TEMPLATE.parse(parentName).get("project");
   }
 
-  /** Parses the project from the given fully-qualified path which represents a sink resource. */
-  public static final String parseProjectFromSinkName(String sinkName) {
-    return SINK_PATH_TEMPLATE.parse(sinkName).get("project");
-  }
-
-  /** Parses the sink from the given fully-qualified path which represents a sink resource. */
-  public static final String parseSinkFromSinkName(String sinkName) {
-    return SINK_PATH_TEMPLATE.parse(sinkName).get("sink");
-  }
-
   /** Parses the project from the given fully-qualified path which represents a metric resource. */
   public static final String parseProjectFromMetricName(String metricName) {
     return METRIC_PATH_TEMPLATE.parse(metricName).get("project");
@@ -168,16 +138,6 @@ public static final String parseMetricFromMetricName(String metricName) {
     return METRIC_PATH_TEMPLATE.parse(metricName).get("metric");
   }
 
-  /** Parses the project from the given fully-qualified path which represents a log resource. */
-  public static final String parseProjectFromLogName(String logName) {
-    return LOG_PATH_TEMPLATE.parse(logName).get("project");
-  }
-
-  /** Parses the log from the given fully-qualified path which represents a log resource. */
-  public static final String parseLogFromLogName(String logName) {
-    return LOG_PATH_TEMPLATE.parse(logName).get("log");
-  }
-
   /** Constructs an instance of MetricsServiceV2Api with default settings. */
   public static final MetricsServiceV2Api create() throws IOException {
     return create(MetricsServiceV2Settings.defaultBuilder().build());
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Test.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Test.java
index d008b21cac6a..105f7579b93e 100644
--- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Test.java
+++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Test.java
@@ -176,11 +176,12 @@ public void listLogEntriesTest() {
             .build();
     mockLoggingServiceV2.addResponse(expectedResponse);
 
-    List<String> projectIds = new ArrayList<>();
+    List<String> resourceNames = new ArrayList<>();
     String filter = "filter-1274492040";
     String orderBy = "orderBy1234304744";
 
-    ListLogEntriesPagedResponse pagedListResponse = api.listLogEntries(projectIds, filter, orderBy);
+    ListLogEntriesPagedResponse pagedListResponse =
+        api.listLogEntries(resourceNames, filter, orderBy);
 
     List<LogEntry> resources = Lists.newArrayList(pagedListResponse.iterateAllElements());
     Assert.assertEquals(1, resources.size());
@@ -190,7 +191,7 @@ public void listLogEntriesTest() {
     Assert.assertEquals(1, actualRequests.size());
     ListLogEntriesRequest actualRequest = (ListLogEntriesRequest) actualRequests.get(0);
 
-    Assert.assertEquals(projectIds, actualRequest.getProjectIdsList());
+    Assert.assertEquals(resourceNames, actualRequest.getResourceNamesList());
     Assert.assertEquals(filter, actualRequest.getFilter());
     Assert.assertEquals(orderBy, actualRequest.getOrderBy());
   }
@@ -202,11 +203,11 @@ public void listLogEntriesExceptionTest() throws Exception {
     mockLoggingServiceV2.addException(exception);
 
     try {
-      List<String> projectIds = new ArrayList<>();
+      List<String> resourceNames = new ArrayList<>();
       String filter = "filter-1274492040";
       String orderBy = "orderBy1234304744";
 
-      api.listLogEntries(projectIds, filter, orderBy);
+      api.listLogEntries(resourceNames, filter, orderBy);
       Assert.fail("No exception raised");
     } catch (ApiException e) {
       Assert.assertEquals(Status.INTERNAL.getCode(), e.getStatusCode());
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockConfigServiceV2.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockConfigServiceV2.java
index 1d4eab132b16..020f0fff8fa6 100644
--- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockConfigServiceV2.java
+++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockConfigServiceV2.java
@@ -43,7 +43,6 @@ public void addException(Exception exception) {
     serviceImpl.addException(exception);
   }
 
-  @Override
   public void setResponses(List<GeneratedMessageV3> responses) {
     serviceImpl.setResponses(responses);
   }
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockLoggingServiceV2.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockLoggingServiceV2.java
index fffe26f52b97..9e3a6bd0ea99 100644
--- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockLoggingServiceV2.java
+++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockLoggingServiceV2.java
@@ -43,7 +43,6 @@ public void addException(Exception exception) {
     serviceImpl.addException(exception);
   }
 
-  @Override
   public void setResponses(List<GeneratedMessageV3> responses) {
     serviceImpl.setResponses(responses);
   }
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockMetricsServiceV2.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockMetricsServiceV2.java
index 00d11959a11e..f3c82f61a7f7 100644
--- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockMetricsServiceV2.java
+++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockMetricsServiceV2.java
@@ -43,7 +43,6 @@ public void addException(Exception exception) {
     serviceImpl.addException(exception);
   }
 
-  @Override
   public void setResponses(List<GeneratedMessageV3> responses) {
     serviceImpl.setResponses(responses);
   }
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceApi.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceApi.java
index 01083ab968dd..553226ebc2ed 100644
--- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceApi.java
+++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceApi.java
@@ -125,14 +125,6 @@ public class GroupServiceApi implements AutoCloseable {
   private static final PathTemplate GROUP_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}/groups/{group}");
 
-  private static final PathTemplate METRIC_DESCRIPTOR_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/metricDescriptors/{metric_descriptor=**}");
-
-  private static final PathTemplate MONITORED_RESOURCE_DESCRIPTOR_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/monitoredResourceDescriptors/{monitored_resource_descriptor}");
-
   /** Formats a string containing the fully-qualified path to represent a project resource. */
   public static final String formatProjectName(String project) {
     return PROJECT_PATH_TEMPLATE.instantiate("project", project);
@@ -145,26 +137,6 @@ public static final String formatGroupName(String project, String group) {
         "group", group);
   }
 
-  /**
-   * Formats a string containing the fully-qualified path to represent a metric_descriptor resource.
-   */
-  public static final String formatMetricDescriptorName(String project, String metricDescriptor) {
-    return METRIC_DESCRIPTOR_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "metric_descriptor", metricDescriptor);
-  }
-
-  /**
-   * Formats a string containing the fully-qualified path to represent a
-   * monitored_resource_descriptor resource.
-   */
-  public static final String formatMonitoredResourceDescriptorName(
-      String project, String monitoredResourceDescriptor) {
-    return MONITORED_RESOURCE_DESCRIPTOR_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "monitored_resource_descriptor", monitoredResourceDescriptor);
-  }
-
   /** Parses the project from the given fully-qualified path which represents a project resource. */
   public static final String parseProjectFromProjectName(String projectName) {
     return PROJECT_PATH_TEMPLATE.parse(projectName).get("project");
@@ -180,45 +152,6 @@ public static final String parseGroupFromGroupName(String groupName) {
     return GROUP_PATH_TEMPLATE.parse(groupName).get("group");
   }
 
-  /**
-   * Parses the project from the given fully-qualified path which represents a metric_descriptor
-   * resource.
-   */
-  public static final String parseProjectFromMetricDescriptorName(String metricDescriptorName) {
-    return METRIC_DESCRIPTOR_PATH_TEMPLATE.parse(metricDescriptorName).get("project");
-  }
-
-  /**
-   * Parses the metric_descriptor from the given fully-qualified path which represents a
-   * metric_descriptor resource.
-   */
-  public static final String parseMetricDescriptorFromMetricDescriptorName(
-      String metricDescriptorName) {
-    return METRIC_DESCRIPTOR_PATH_TEMPLATE.parse(metricDescriptorName).get("metric_descriptor");
-  }
-
-  /**
-   * Parses the project from the given fully-qualified path which represents a
-   * monitored_resource_descriptor resource.
-   */
-  public static final String parseProjectFromMonitoredResourceDescriptorName(
-      String monitoredResourceDescriptorName) {
-    return MONITORED_RESOURCE_DESCRIPTOR_PATH_TEMPLATE
-        .parse(monitoredResourceDescriptorName)
-        .get("project");
-  }
-
-  /**
-   * Parses the monitored_resource_descriptor from the given fully-qualified path which represents a
-   * monitored_resource_descriptor resource.
-   */
-  public static final String parseMonitoredResourceDescriptorFromMonitoredResourceDescriptorName(
-      String monitoredResourceDescriptorName) {
-    return MONITORED_RESOURCE_DESCRIPTOR_PATH_TEMPLATE
-        .parse(monitoredResourceDescriptorName)
-        .get("monitored_resource_descriptor");
-  }
-
   /** Constructs an instance of GroupServiceApi with default settings. */
   public static final GroupServiceApi create() throws IOException {
     return create(GroupServiceSettings.defaultBuilder().build());
@@ -527,6 +460,7 @@ public final UnaryCallable<CreateGroupRequest, Group> createGroupCallable() {
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
   public final Group updateGroup(Group group) {
+
     UpdateGroupRequest request = UpdateGroupRequest.newBuilder().setGroup(group).build();
     return updateGroup(request);
   }
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceApi.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceApi.java
index 63f874323a54..64229025ffa2 100644
--- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceApi.java
+++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceApi.java
@@ -134,9 +134,6 @@ public class MetricServiceApi implements AutoCloseable {
   private static final PathTemplate PROJECT_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}");
 
-  private static final PathTemplate GROUP_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/groups/{group}");
-
   private static final PathTemplate METRIC_DESCRIPTOR_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding(
           "projects/{project}/metricDescriptors/{metric_descriptor=**}");
@@ -150,13 +147,6 @@ public static final String formatProjectName(String project) {
     return PROJECT_PATH_TEMPLATE.instantiate("project", project);
   }
 
-  /** Formats a string containing the fully-qualified path to represent a group resource. */
-  public static final String formatGroupName(String project, String group) {
-    return GROUP_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "group", group);
-  }
-
   /**
    * Formats a string containing the fully-qualified path to represent a metric_descriptor resource.
    */
@@ -182,16 +172,6 @@ public static final String parseProjectFromProjectName(String projectName) {
     return PROJECT_PATH_TEMPLATE.parse(projectName).get("project");
   }
 
-  /** Parses the project from the given fully-qualified path which represents a group resource. */
-  public static final String parseProjectFromGroupName(String groupName) {
-    return GROUP_PATH_TEMPLATE.parse(groupName).get("project");
-  }
-
-  /** Parses the group from the given fully-qualified path which represents a group resource. */
-  public static final String parseGroupFromGroupName(String groupName) {
-    return GROUP_PATH_TEMPLATE.parse(groupName).get("group");
-  }
-
   /**
    * Parses the project from the given fully-qualified path which represents a metric_descriptor
    * resource.
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockGroupService.java b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockGroupService.java
index 28274f386e23..4b12fe3b5cda 100644
--- a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockGroupService.java
+++ b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockGroupService.java
@@ -43,7 +43,6 @@ public void addException(Exception exception) {
     serviceImpl.addException(exception);
   }
 
-  @Override
   public void setResponses(List<GeneratedMessageV3> responses) {
     serviceImpl.setResponses(responses);
   }
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockMetricService.java b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockMetricService.java
index 355bab0598b4..268f78db56f4 100644
--- a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockMetricService.java
+++ b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockMetricService.java
@@ -43,7 +43,6 @@ public void addException(Exception exception) {
     serviceImpl.addException(exception);
   }
 
-  @Override
   public void setResponses(List<GeneratedMessageV3> responses) {
     serviceImpl.setResponses(responses);
   }
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PublisherApi.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PublisherApi.java
index 17ba9556936e..a04d6c93444f 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PublisherApi.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PublisherApi.java
@@ -254,6 +254,7 @@ public final PublisherSettings getSettings() {
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
   public final Topic createTopic(TopicName name) {
+
     Topic request = Topic.newBuilder().setNameWithTopicName(name).build();
     return createTopic(request);
   }
@@ -328,6 +329,7 @@ public final UnaryCallable<Topic, Topic> createTopicCallable() {
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
   public final PublishResponse publish(TopicName topic, List<PubsubMessage> messages) {
+
     PublishRequest request =
         PublishRequest.newBuilder().setTopicWithTopicName(topic).addAllMessages(messages).build();
     return publish(request);
@@ -411,6 +413,7 @@ public final UnaryCallable<PublishRequest, PublishResponse> publishCallable() {
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
   public final Topic getTopic(TopicName topic) {
+
     GetTopicRequest request = GetTopicRequest.newBuilder().setTopicWithTopicName(topic).build();
     return getTopic(request);
   }
@@ -691,6 +694,7 @@ public final ListTopicSubscriptionsPagedResponse listTopicSubscriptions(
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
   public final void deleteTopic(TopicName topic) {
+
     DeleteTopicRequest request =
         DeleteTopicRequest.newBuilder().setTopicWithTopicName(topic).build();
     deleteTopic(request);
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriberApi.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriberApi.java
index 27ef26fa3122..1ca06a557e2e 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriberApi.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriberApi.java
@@ -309,6 +309,7 @@ public final SubscriberSettings getSettings() {
    */
   public final Subscription createSubscription(
       SubscriptionName name, TopicName topic, PushConfig pushConfig, int ackDeadlineSeconds) {
+
     Subscription request =
         Subscription.newBuilder()
             .setNameWithSubscriptionName(name)
@@ -395,6 +396,7 @@ public final UnaryCallable<Subscription, Subscription> createSubscriptionCallabl
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
   public final Subscription getSubscription(SubscriptionName subscription) {
+
     GetSubscriptionRequest request =
         GetSubscriptionRequest.newBuilder()
             .setSubscriptionWithSubscriptionName(subscription)
@@ -573,6 +575,7 @@ public final ListSubscriptionsPagedResponse listSubscriptions(ListSubscriptionsR
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
   public final void deleteSubscription(SubscriptionName subscription) {
+
     DeleteSubscriptionRequest request =
         DeleteSubscriptionRequest.newBuilder()
             .setSubscriptionWithSubscriptionName(subscription)
@@ -659,6 +662,7 @@ public final UnaryCallable<DeleteSubscriptionRequest, Empty> deleteSubscriptionC
    */
   public final void modifyAckDeadline(
       SubscriptionName subscription, List<String> ackIds, int ackDeadlineSeconds) {
+
     ModifyAckDeadlineRequest request =
         ModifyAckDeadlineRequest.newBuilder()
             .setSubscriptionWithSubscriptionName(subscription)
@@ -751,6 +755,7 @@ public final UnaryCallable<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineCal
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
   public final void acknowledge(SubscriptionName subscription, List<String> ackIds) {
+
     AcknowledgeRequest request =
         AcknowledgeRequest.newBuilder()
             .setSubscriptionWithSubscriptionName(subscription)
@@ -844,6 +849,7 @@ public final UnaryCallable<AcknowledgeRequest, Empty> acknowledgeCallable() {
    */
   public final PullResponse pull(
       SubscriptionName subscription, boolean returnImmediately, int maxMessages) {
+
     PullRequest request =
         PullRequest.newBuilder()
             .setSubscriptionWithSubscriptionName(subscription)
@@ -933,6 +939,7 @@ public final UnaryCallable<PullRequest, PullResponse> pullCallable() {
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
   public final void modifyPushConfig(SubscriptionName subscription, PushConfig pushConfig) {
+
     ModifyPushConfigRequest request =
         ModifyPushConfigRequest.newBuilder()
             .setSubscriptionWithSubscriptionName(subscription)
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechApi.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechApi.java
index 09f190bdbce0..5c3424afafc5 100644
--- a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechApi.java
+++ b/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechApi.java
@@ -177,6 +177,7 @@ public final SpeechSettings getSettings() {
    */
   public final SyncRecognizeResponse syncRecognize(
       RecognitionConfig config, RecognitionAudio audio) {
+
     SyncRecognizeRequest request =
         SyncRecognizeRequest.newBuilder().setConfig(config).setAudio(audio).build();
     return syncRecognize(request);
@@ -255,6 +256,7 @@ public final UnaryCallable<SyncRecognizeRequest, SyncRecognizeResponse> syncReco
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
   public final Operation asyncRecognize(RecognitionConfig config, RecognitionAudio audio) {
+
     AsyncRecognizeRequest request =
         AsyncRecognizeRequest.newBuilder().setConfig(config).setAudio(audio).build();
     return asyncRecognize(request);
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/MockSpeech.java b/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/MockSpeech.java
index e1f7692864eb..7f9e1dd4c7a1 100644
--- a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/MockSpeech.java
+++ b/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/MockSpeech.java
@@ -43,7 +43,6 @@ public void addException(Exception exception) {
     serviceImpl.addException(exception);
   }
 
-  @Override
   public void setResponses(List<GeneratedMessageV3> responses) {
     serviceImpl.setResponses(responses);
   }
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceApi.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceApi.java
index 2f51593452a7..3b6c343843c5 100644
--- a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceApi.java
+++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceApi.java
@@ -183,6 +183,7 @@ public final TraceServiceSettings getSettings() {
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
   public final void patchTraces(String projectId, Traces traces) {
+
     PatchTracesRequest request =
         PatchTracesRequest.newBuilder().setProjectId(projectId).setTraces(traces).build();
     patchTraces(request);
@@ -262,6 +263,7 @@ public final UnaryCallable<PatchTracesRequest, Empty> patchTracesCallable() {
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
   public final Trace getTrace(String projectId, String traceId) {
+
     GetTraceRequest request =
         GetTraceRequest.newBuilder().setProjectId(projectId).setTraceId(traceId).build();
     return getTrace(request);
diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/MockTraceService.java b/google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/MockTraceService.java
index 9e9c6477ac75..c480df752b3c 100644
--- a/google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/MockTraceService.java
+++ b/google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/MockTraceService.java
@@ -43,7 +43,6 @@ public void addException(Exception exception) {
     serviceImpl.addException(exception);
   }
 
-  @Override
   public void setResponses(List<GeneratedMessageV3> responses) {
     serviceImpl.setResponses(responses);
   }
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/ImageAnnotatorApi.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/ImageAnnotatorApi.java
index be8449723ad2..34bbf2e8cb13 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/ImageAnnotatorApi.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/ImageAnnotatorApi.java
@@ -162,6 +162,7 @@ public final ImageAnnotatorSettings getSettings() {
    */
   public final BatchAnnotateImagesResponse batchAnnotateImages(
       List<AnnotateImageRequest> requests) {
+
     BatchAnnotateImagesRequest request =
         BatchAnnotateImagesRequest.newBuilder().addAllRequests(requests).build();
     return batchAnnotateImages(request);
diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/spi/v1/MockImageAnnotator.java b/google-cloud-vision/src/test/java/com/google/cloud/vision/spi/v1/MockImageAnnotator.java
index b72915454ecd..3aae35e55ae9 100644
--- a/google-cloud-vision/src/test/java/com/google/cloud/vision/spi/v1/MockImageAnnotator.java
+++ b/google-cloud-vision/src/test/java/com/google/cloud/vision/spi/v1/MockImageAnnotator.java
@@ -43,7 +43,6 @@ public void addException(Exception exception) {
     serviceImpl.addException(exception);
   }
 
-  @Override
   public void setResponses(List<GeneratedMessageV3> responses) {
     serviceImpl.setResponses(responses);
   }