diff --git a/server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java b/server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java
index f576667f44109..e1a413f6aa9bb 100644
--- a/server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java
+++ b/server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-//TODO(simonw): can all these classes go into org.elasticsearch.ingest?
 
 package org.elasticsearch.ingest;
 
diff --git a/server/src/test/java/org/elasticsearch/ingest/ConfigurationUtilsTests.java b/server/src/test/java/org/elasticsearch/ingest/ConfigurationUtilsTests.java
index f3a11a86e54e5..9111658e49ca8 100644
--- a/server/src/test/java/org/elasticsearch/ingest/ConfigurationUtilsTests.java
+++ b/server/src/test/java/org/elasticsearch/ingest/ConfigurationUtilsTests.java
@@ -92,12 +92,6 @@ public void testReadBooleanPropertyInvalidType() {
         }
     }
 
-    // TODO(talevy): Issue with generics. This test should fail, "int" is of type List<Integer>
-    public void testOptional_InvalidType() {
-        List<String> val = ConfigurationUtils.readList(null, null, config, "int");
-        assertThat(val, equalTo(Collections.singletonList(2)));
-    }
-
     public void testReadStringOrIntProperty() {
         String val1 = ConfigurationUtils.readStringOrIntProperty(null, null, config, "foo", null);
         String val2 = ConfigurationUtils.readStringOrIntProperty(null, null, config, "num", null);
diff --git a/server/src/test/java/org/elasticsearch/ingest/IngestClientIT.java b/server/src/test/java/org/elasticsearch/ingest/IngestClientIT.java
index 65139109a83a2..6e5d862372ac6 100644
--- a/server/src/test/java/org/elasticsearch/ingest/IngestClientIT.java
+++ b/server/src/test/java/org/elasticsearch/ingest/IngestClientIT.java
@@ -60,7 +60,6 @@ public class IngestClientIT extends ESIntegTestCase {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
-        // TODO: Remove this method once gets in: https://github.com/elastic/elasticsearch/issues/16019
         if (nodeOrdinal % 2 == 0) {
             return Settings.builder().put("node.ingest", false).put(super.nodeSettings(nodeOrdinal)).build();
         }