diff --git a/alts/src/main/java/io/grpc/alts/internal/AltsProtocolNegotiator.java b/alts/src/main/java/io/grpc/alts/internal/AltsProtocolNegotiator.java
index e1a251c2a1..53749f3e1d 100644
--- a/alts/src/main/java/io/grpc/alts/internal/AltsProtocolNegotiator.java
+++ b/alts/src/main/java/io/grpc/alts/internal/AltsProtocolNegotiator.java
@@ -85,7 +85,6 @@ public final class AltsProtocolNegotiator {
     }
   }
 
-  @VisibleForTesting
   private static final class ClientAltsProtocolNegotiator implements ProtocolNegotiator {
     private final TsiHandshakerFactory handshakerFactory;
     private final LazyChannel lazyHandshakerChannel;
diff --git a/api/src/test/java/io/grpc/LoadBalancerTest.java b/api/src/test/java/io/grpc/LoadBalancerTest.java
index 4bbac63aeb..5933fdd210 100644
--- a/api/src/test/java/io/grpc/LoadBalancerTest.java
+++ b/api/src/test/java/io/grpc/LoadBalancerTest.java
@@ -124,7 +124,6 @@ public class LoadBalancerTest {
 
   @Deprecated
   @Test
-  @SuppressWarnings("deprecation")
   public void helper_createSubchannel_old_delegates() {
     class OverrideCreateSubchannel extends NoopHelper {
       boolean ran;
diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
index bbbadddc77..d0cc13576f 100644
--- a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
+++ b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
@@ -1053,7 +1053,6 @@ final class ManagedChannelImpl extends ManagedChannel implements
 
     @Deprecated
     @Override
-    @SuppressWarnings("deprecation")
     public AbstractSubchannel createSubchannel(
         List<EquivalentAddressGroup> addressGroups, Attributes attrs) {
       logWarningIfNotInSyncContext("createSubchannel()");
diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java
index f8caecdae7..4b4a201b25 100644
--- a/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java
+++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java
@@ -341,7 +341,6 @@ public class ManagedChannelImplTest {
 
   @Deprecated
   @Test
-  @SuppressWarnings("deprecation")
   public void createSubchannel_old_outsideSynchronizationContextShouldLogWarning() {
     createChannel();
     final AtomicReference<LogRecord> logRef = new AtomicReference<>();
diff --git a/xds/src/main/java/io/grpc/xds/XdsComms.java b/xds/src/main/java/io/grpc/xds/XdsComms.java
index d78888fd80..910d8b91f6 100644
--- a/xds/src/main/java/io/grpc/xds/XdsComms.java
+++ b/xds/src/main/java/io/grpc/xds/XdsComms.java
@@ -364,7 +364,7 @@ final class XdsComms {
       case MILLION:
         break;
       default:
-        throw new IllegalArgumentException("unknow denominator type of " + fractionalPercent);
+        throw new IllegalArgumentException("unknown denominator type of " + fractionalPercent);
     }
 
     if (numerator > 1000_000) {
diff --git a/xds/src/main/java/io/grpc/xds/XdsLoadBalancer.java b/xds/src/main/java/io/grpc/xds/XdsLoadBalancer.java
index a83959f725..47729a0585 100644
--- a/xds/src/main/java/io/grpc/xds/XdsLoadBalancer.java
+++ b/xds/src/main/java/io/grpc/xds/XdsLoadBalancer.java
@@ -191,7 +191,7 @@ final class XdsLoadBalancer extends LoadBalancer {
   }
 
   /**
-   * This is only for the subchannel that is created by the the child/fallback balancer using the
+   * This is only for the subchannel that is created by the child/fallback balancer using the
    * old API {@link LoadBalancer.Helper#createSubchannel(EquivalentAddressGroup, Attributes)} or
    * {@link LoadBalancer.Helper#createSubchannel(List, Attributes)}. Otherwise, it either won't be
    * called or won't have any effect.
diff --git a/xds/src/test/java/io/grpc/xds/XdsCommsTest.java b/xds/src/test/java/io/grpc/xds/XdsCommsTest.java
index 71ee1fc3c4..ec64c291e7 100644
--- a/xds/src/test/java/io/grpc/xds/XdsCommsTest.java
+++ b/xds/src/test/java/io/grpc/xds/XdsCommsTest.java
@@ -303,13 +303,6 @@ public class XdsCommsTest {
                     .setAddress("addr11").setPortValue(11))))
         .setLoadBalancingWeight(UInt32Value.of(11))
         .build();
-    LbEndpoint endpoint12 = LbEndpoint.newBuilder()
-        .setEndpoint(Endpoint.newBuilder()
-            .setAddress(Address.newBuilder()
-                .setSocketAddress(SocketAddress.newBuilder()
-                    .setAddress("addr12").setPortValue(12))))
-        .setLoadBalancingWeight(UInt32Value.of(12))
-        .build();
     Locality localityProto2 = Locality.newBuilder()
         .setRegion("region2").setZone("zone2").setSubZone("subzone2").build();
     LbEndpoint endpoint21 = LbEndpoint.newBuilder()
@@ -319,14 +312,6 @@ public class XdsCommsTest {
                     .setAddress("addr21").setPortValue(21))))
         .setLoadBalancingWeight(UInt32Value.of(21))
         .build();
-    LbEndpoint endpoint22 = LbEndpoint.newBuilder()
-        .setEndpoint(Endpoint.newBuilder()
-            .setAddress(Address.newBuilder()
-                .setSocketAddress(SocketAddress.newBuilder()
-                    .setAddress("addr22").setPortValue(22))))
-        .setLoadBalancingWeight(UInt32Value.of(22))
-        .build();
-
 
     DiscoveryResponse edsResponseWithDrops = DiscoveryResponse.newBuilder()
         .addResources(Any.pack(ClusterLoadAssignment.newBuilder()