diff --git a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractProto.java b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractProto.java
index d341d151987..416aa90d2b7 100644
--- a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractProto.java
+++ b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractProto.java
@@ -55,7 +55,7 @@ public abstract class AbstractProto {
             throw new IOException("Response version [" + version + "] does not match client version ["
                     + CURRENT_VERSION + "]. Server is busted.");
         }
-        // NOCOMMIT why do I need the response type at all? Just a byte for err/exception/normal, then get response type from request.
+        // TODO why do I need the response type at all? Just a byte for err/exception/normal, then get response type from request.
         Response response = readResponseType(in).reader().read(request, in);
         if (response.requestType() != request.requestType()) {
             throw new IOException("Expected request type to be [" + request.requestType()
diff --git a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/TimeoutInfo.java b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/TimeoutInfo.java
index b1004c99b5f..3004cd70332 100644
--- a/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/TimeoutInfo.java
+++ b/sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/TimeoutInfo.java
@@ -11,7 +11,6 @@ import java.io.IOException;
 import java.util.Objects;
 
 public class TimeoutInfo {
-    // NOCOMMIT javadoc on each of these would be nice because I don't know from reading how "timeout" is different from requestTimeout
     public final long clientTime, timeout, requestTimeout;
 
     public TimeoutInfo(long clientTime, long timeout, long requestTimeout) {