diff --git a/gax/src/main/java/com/google/api/gax/batching/BatcherImpl.java b/gax/src/main/java/com/google/api/gax/batching/BatcherImpl.java
index 44d8a98d7..2b2d1a0f2 100644
--- a/gax/src/main/java/com/google/api/gax/batching/BatcherImpl.java
+++ b/gax/src/main/java/com/google/api/gax/batching/BatcherImpl.java
@@ -256,8 +256,6 @@ void add(ElementT element, SettableApiFuture<ElementResultT> result) {
       byteCounter += descriptor.countBytes(element);
     }
 
-    // TODO: Ensure that all results are resolved in case the descriptor that causes it to
-    //  process all results or throw an exception during processing
     void onBatchSuccess(ResponseT response) {
       try {
         descriptor.splitResponse(response, results);
diff --git a/gax/src/test/java/com/google/api/gax/batching/BatcherImplTest.java b/gax/src/test/java/com/google/api/gax/batching/BatcherImplTest.java
index 7f5787119..4f0d9452d 100644
--- a/gax/src/test/java/com/google/api/gax/batching/BatcherImplTest.java
+++ b/gax/src/test/java/com/google/api/gax/batching/BatcherImplTest.java
@@ -509,7 +509,6 @@ public void splitResponse(
                 + "3 entries that failed with: 3 ArithmeticException.");
   }
 
-  // TODO(rahulkql): fix this test with follow up PR related to exception in splitResponse.
   @Test
   public void testPartialFailureInResultProcessing() throws Exception {
     final Queue<RuntimeException> queue = Queues.newArrayBlockingQueue(3);