diff --git a/plugin/src/main/java/org/elasticsearch/xpack/sql/plugin/SecurityCatalogFilter.java b/plugin/src/main/java/org/elasticsearch/xpack/sql/plugin/SecurityCatalogFilter.java
index f415a5f7e0b..5f3ab4e8fc1 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/sql/plugin/SecurityCatalogFilter.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/sql/plugin/SecurityCatalogFilter.java
@@ -31,7 +31,6 @@ import java.util.function.BiFunction;
  * statements like {@code SHOW TABLES} and {@code DESCRIBE TABLE}. 
  */
 public class SecurityCatalogFilter implements FilteredCatalog.Filter {
-    // NOCOMMIT need to figure out sql on aliases that expand to many indices
     private static final IndicesOptions OPTIONS = IndicesOptions.strictSingleIndexNoExpandForbidClosed();
 
     private final ThreadContext threadContext;
diff --git a/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/CliHttpClient.java b/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/CliHttpClient.java
index 8bc03f21285..ec382b3b2e5 100644
--- a/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/CliHttpClient.java
+++ b/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/CliHttpClient.java
@@ -36,13 +36,11 @@ public class CliHttpClient implements AutoCloseable {
 
     public QueryInitResponse queryInit(String query, int fetchSize) {
         // TODO allow customizing the time zone
-        // NOCOMMIT figure out Timeouts....
         QueryInitRequest request = new QueryInitRequest(query, fetchSize, TimeZone.getTimeZone("UTC"), new TimeoutInfo(0, 0, 0));
         return (QueryInitResponse) sendRequest(request);
     }
 
     public QueryPageResponse nextPage(byte[] cursor) {
-        // NOCOMMIT figure out Timeouts....
         QueryPageRequest request = new QueryPageRequest(cursor, new TimeoutInfo(0, 0, 0));
         return (QueryPageResponse) sendRequest(request);
     }
diff --git a/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/ResponseToString.java b/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/ResponseToString.java
index 0236a5979bb..06c571bef92 100644
--- a/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/ResponseToString.java
+++ b/sql/cli/src/main/java/org/elasticsearch/xpack/sql/cli/ResponseToString.java
@@ -69,7 +69,7 @@ abstract class ResponseToString {
         return sb;
     }
 
-    @SuppressForbidden(reason="ignore for now") // NOCOMMIT figure this out
+    @SuppressForbidden(reason="ignore for now") // NOCOMMIT replace this with saving the file and printing a message
     private static void displayGraphviz(String str) {
         try {
             // save the content to a temp file
diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Page.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Page.java
index 503d86db44a..6e08dbe963c 100644
--- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Page.java
+++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Page.java
@@ -16,12 +16,11 @@ import java.util.Objects;
 import static org.elasticsearch.xpack.sql.jdbc.net.protocol.ProtoUtils.classOf;
 import static org.elasticsearch.xpack.sql.jdbc.net.protocol.ProtoUtils.readValue;
 import static org.elasticsearch.xpack.sql.jdbc.net.protocol.ProtoUtils.writeValue;
+
 /**
  * Stores a page of data in a columnar format.
  */
 public class Page implements Payload {
-    private final List<ColumnInfo> columnInfo;
-
     /**
      * The actual data, one array per column.
      */
diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/ProtoUtils.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/ProtoUtils.java
index e8ade14ab32..d71c3d771b2 100644
--- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/ProtoUtils.java
+++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/ProtoUtils.java
@@ -20,7 +20,7 @@ public class ProtoUtils {
         // NOCOMMIT <T> feels slippery here
         Object result;
         byte hasNext = in.readByte();
-        if (hasNext == 0) { // NOCOMMIT feels like a bitmask at the start of the row would be better.
+        if (hasNext == 0) { // TODO feels like a bitmask at the start of the row would be better.
             return null;
         }
         // NOCOMMIT we ought to make sure we use all of these
diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/QueryInitResponse.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/QueryInitResponse.java
index 8ce384cc1a8..4bbecbfe9ce 100644
--- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/QueryInitResponse.java
+++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/QueryInitResponse.java
@@ -77,11 +77,11 @@ public class QueryInitResponse extends AbstractQueryResponse {
         }
         QueryInitResponse other = (QueryInitResponse) obj;
         return columns.equals(other.columns);
-        // NOCOMMIT data
+        // NOCOMMIT equals should take into account data
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), columns); // NOCOMMIT data
+        return Objects.hash(super.hashCode(), columns); // NOCOMMIT equals should take into account data
     }
 }
\ No newline at end of file
diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/sql/action/SqlResponse.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/sql/action/SqlResponse.java
index 21ab5ad420b..184925910ef 100644
--- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/sql/action/SqlResponse.java
+++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/sql/action/SqlResponse.java
@@ -27,6 +27,7 @@ public class SqlResponse extends ActionResponse implements ToXContentObject {
     private long size;
     private int columnCount;
     private List<ColumnInfo> columns;
+    // NOCOMMIT investigate reusing Page here - it probably is much more efficient
     private List<List<Object>> rows;
 
     public SqlResponse() {