diff --git a/alts/src/main/java/io/grpc/alts/AltsChannelBuilder.java b/alts/src/main/java/io/grpc/alts/AltsChannelBuilder.java
index 81dd75eab46..af80a3c5dda 100644
--- a/alts/src/main/java/io/grpc/alts/AltsChannelBuilder.java
+++ b/alts/src/main/java/io/grpc/alts/AltsChannelBuilder.java
@@ -38,7 +38,7 @@ public final class AltsChannelBuilder extends ForwardingChannelBuilder2<AltsChan
       new AltsChannelCredentials.Builder();
 
   /** "Overrides" the static method in {@link ManagedChannelBuilder}. */
-  public static final AltsChannelBuilder forTarget(String target) {
+  public static AltsChannelBuilder forTarget(String target) {
     return new AltsChannelBuilder(target);
   }
 
diff --git a/alts/src/main/java/io/grpc/alts/ComputeEngineChannelBuilder.java b/alts/src/main/java/io/grpc/alts/ComputeEngineChannelBuilder.java
index 8898c33cd30..b5ee6a8d362 100644
--- a/alts/src/main/java/io/grpc/alts/ComputeEngineChannelBuilder.java
+++ b/alts/src/main/java/io/grpc/alts/ComputeEngineChannelBuilder.java
@@ -35,7 +35,7 @@ private ComputeEngineChannelBuilder(String target) {
   }
 
   /** "Overrides" the static method in {@link ManagedChannelBuilder}. */
-  public static final ComputeEngineChannelBuilder forTarget(String target) {
+  public static ComputeEngineChannelBuilder forTarget(String target) {
     return new ComputeEngineChannelBuilder(target);
   }
 
diff --git a/alts/src/main/java/io/grpc/alts/GoogleDefaultChannelBuilder.java b/alts/src/main/java/io/grpc/alts/GoogleDefaultChannelBuilder.java
index 8e628065113..c78b94417c4 100644
--- a/alts/src/main/java/io/grpc/alts/GoogleDefaultChannelBuilder.java
+++ b/alts/src/main/java/io/grpc/alts/GoogleDefaultChannelBuilder.java
@@ -35,7 +35,7 @@ private GoogleDefaultChannelBuilder(String target) {
   }
 
   /** "Overrides" the static method in {@link ManagedChannelBuilder}. */
-  public static final GoogleDefaultChannelBuilder forTarget(String target) {
+  public static GoogleDefaultChannelBuilder forTarget(String target) {
     return new GoogleDefaultChannelBuilder(target);
   }
 
diff --git a/alts/src/test/java/io/grpc/alts/internal/AltsHandshakerStubTest.java b/alts/src/test/java/io/grpc/alts/internal/AltsHandshakerStubTest.java
index fc2b440749a..7a6018b5064 100644
--- a/alts/src/test/java/io/grpc/alts/internal/AltsHandshakerStubTest.java
+++ b/alts/src/test/java/io/grpc/alts/internal/AltsHandshakerStubTest.java
@@ -32,7 +32,7 @@
 @RunWith(JUnit4.class)
 public class AltsHandshakerStubTest {
   /** Mock status of handshaker service. */
-  private static enum Status {
+  private enum Status {
     OK,
     ERROR,
     COMPLETE
diff --git a/core/src/testFixtures/java/io/grpc/internal/TestUtils.java b/core/src/testFixtures/java/io/grpc/internal/TestUtils.java
index 055a7f80283..e5aab81c1bb 100644
--- a/core/src/testFixtures/java/io/grpc/internal/TestUtils.java
+++ b/core/src/testFixtures/java/io/grpc/internal/TestUtils.java
@@ -146,7 +146,7 @@ public Runnable answer(InvocationOnMock invocation) throws Throwable {
   }
 
   @SuppressWarnings("ReferenceEquality")
-  public static final EquivalentAddressGroup stripAttrs(EquivalentAddressGroup eag) {
+  public static EquivalentAddressGroup stripAttrs(EquivalentAddressGroup eag) {
     if (eag.getAttributes() == Attributes.EMPTY) {
       return eag;
     }
diff --git a/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideServer.java b/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideServer.java
index b39b06a6f92..2673b1b728d 100644
--- a/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideServer.java
+++ b/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideServer.java
@@ -72,19 +72,16 @@ public RouteGuideServer(ServerBuilder<?> serverBuilder, int port, Collection<Fea
   public void start() throws IOException {
     server.start();
     logger.info("Server started, listening on " + port);
-    Runtime.getRuntime().addShutdownHook(new Thread() {
-      @Override
-      public void run() {
-        // Use stderr here since the logger may have been reset by its JVM shutdown hook.
-        System.err.println("*** shutting down gRPC server since JVM is shutting down");
-        try {
-          RouteGuideServer.this.stop();
-        } catch (InterruptedException e) {
-          e.printStackTrace(System.err);
-        }
-        System.err.println("*** server shut down");
+    Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+      // Use stderr here since the logger may have been reset by its JVM shutdown hook.
+      System.err.println("*** shutting down gRPC server since JVM is shutting down");
+      try {
+        RouteGuideServer.this.stop();
+      } catch (InterruptedException e) {
+        e.printStackTrace(System.err);
       }
-    });
+      System.err.println("*** server shut down");
+    }));
   }
 
   /** Stop serving requests and shutdown resources. */
@@ -120,7 +117,7 @@ public static void main(String[] args) throws Exception {
   private static class RouteGuideService extends RouteGuideGrpc.RouteGuideImplBase {
     private final Collection<Feature> features;
     private final ConcurrentMap<Point, List<RouteNote>> routeNotes =
-        new ConcurrentHashMap<Point, List<RouteNote>>();
+        new ConcurrentHashMap<>();
 
     RouteGuideService(Collection<Feature> features) {
       this.features = features;
@@ -251,7 +248,7 @@ public void onCompleted() {
      * Get the notes list for the given location. If missing, create it.
      */
     private List<RouteNote> getOrCreateNotes(Point location) {
-      List<RouteNote> notes = Collections.synchronizedList(new ArrayList<RouteNote>());
+      List<RouteNote> notes = Collections.synchronizedList(new ArrayList<>());
       List<RouteNote> prevNotes = routeNotes.putIfAbsent(location, notes);
       return prevNotes != null ? prevNotes : notes;
     }