diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmark.java
index ee2b39bc941a..dae20d4402da 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmark.java
+++ b/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmark.java
@@ -19,7 +19,15 @@
 
 package org.apache.druid.benchmark;
 
-import org.apache.druid.java.util.common.parsers.Parser;
+import org.apache.druid.data.input.ColumnsFilter;
+import org.apache.druid.data.input.InputRow;
+import org.apache.druid.data.input.InputRowSchema;
+import org.apache.druid.data.input.impl.ByteEntity;
+import org.apache.druid.data.input.impl.DimensionsSpec;
+import org.apache.druid.data.input.impl.JsonInputFormat;
+import org.apache.druid.data.input.impl.TimestampSpec;
+import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.java.util.common.parsers.CloseableIterator;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -38,7 +46,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 @State(Scope.Benchmark)
@@ -50,16 +57,22 @@ public class FlattenJSONBenchmark
 {
   private static final int NUM_EVENTS = 100000;
 
-  List<String> flatInputs;
-  List<String> nestedInputs;
-  List<String> jqInputs;
-  Parser flatParser;
-  Parser nestedParser;
-  Parser jqParser;
-  Parser treeJqParser;
-  Parser treeTreeParser;
-  Parser fieldDiscoveryParser;
-  Parser forcedPathParser;
+  private static final InputRowSchema INPUT_ROW_SCHEMA = new InputRowSchema(
+      new TimestampSpec("ts", "iso", null),
+      DimensionsSpec.EMPTY,
+      ColumnsFilter.all()
+  );
+
+  List<byte[]> flatInputBytes;
+  List<byte[]> nestedInputBytes;
+  List<byte[]> jqInputBytes;
+  JsonInputFormat flatFormat;
+  JsonInputFormat nestedFormat;
+  JsonInputFormat jqFormat;
+  JsonInputFormat treeJqFormat;
+  JsonInputFormat treeTreeFormat;
+  JsonInputFormat fieldDiscoveryFormat;
+  JsonInputFormat forcedPathFormat;
   int flatCounter = 0;
   int nestedCounter = 0;
   int jqCounter = 0;
@@ -68,117 +81,159 @@ public class FlattenJSONBenchmark
   public void prepare() throws Exception
   {
     FlattenJSONBenchmarkUtil gen = new FlattenJSONBenchmarkUtil();
-    flatInputs = new ArrayList<>();
+    flatInputBytes = new ArrayList<>();
     for (int i = 0; i < NUM_EVENTS; i++) {
-      flatInputs.add(gen.generateFlatEvent());
+      flatInputBytes.add(StringUtils.toUtf8(gen.generateFlatEvent()));
     }
-    nestedInputs = new ArrayList<>();
+    nestedInputBytes = new ArrayList<>();
     for (int i = 0; i < NUM_EVENTS; i++) {
-      nestedInputs.add(gen.generateNestedEvent());
+      nestedInputBytes.add(StringUtils.toUtf8(gen.generateNestedEvent()));
     }
-    jqInputs = new ArrayList<>();
+    jqInputBytes = new ArrayList<>();
     for (int i = 0; i < NUM_EVENTS; i++) {
-      jqInputs.add(gen.generateNestedEvent()); // reuse the same event as "nested"
+      jqInputBytes.add(StringUtils.toUtf8(gen.generateNestedEvent())); // reuse the same event as "nested"
     }
 
-    flatParser = gen.getFlatParser();
-    nestedParser = gen.getNestedParser();
-    jqParser = gen.getJqParser();
-    treeJqParser = gen.getTreeJqParser();
-    treeTreeParser = gen.getTreeTreeParser();
-    fieldDiscoveryParser = gen.getFieldDiscoveryParser();
-    forcedPathParser = gen.getForcedPathParser();
+    flatFormat = gen.getFlatFormat();
+    nestedFormat = gen.getNestedFormat();
+    jqFormat = gen.getJqFormat();
+    treeJqFormat = gen.getTreeJqFormat();
+    treeTreeFormat = gen.getTreeTreeFormat();
+    fieldDiscoveryFormat = gen.getFieldDiscoveryFormat();
+    forcedPathFormat = gen.getForcedPathFormat();
   }
 
   @Benchmark
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.MICROSECONDS)
-  public Map<String, Object> baseline(final Blackhole blackhole)
+  public InputRow baseline(final Blackhole blackhole) throws Exception
   {
-    Map<String, Object> parsed = flatParser.parseToMap(flatInputs.get(flatCounter));
-    for (String s : parsed.keySet()) {
-      blackhole.consume(parsed.get(s));
+    try (CloseableIterator<InputRow> iterator = flatFormat.createReader(
+        INPUT_ROW_SCHEMA,
+        new ByteEntity(flatInputBytes.get(flatCounter)),
+        null
+    ).read()) {
+      InputRow row = iterator.next();
+      for (String dim : row.getDimensions()) {
+        blackhole.consume(row.getRaw(dim));
+      }
+      flatCounter = (flatCounter + 1) % NUM_EVENTS;
+      return row;
     }
-    flatCounter = (flatCounter + 1) % NUM_EVENTS;
-    return parsed;
   }
 
   @Benchmark
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.MICROSECONDS)
-  public Map<String, Object> flatten(final Blackhole blackhole)
+  public InputRow flatten(final Blackhole blackhole) throws Exception
   {
-    Map<String, Object> parsed = nestedParser.parseToMap(nestedInputs.get(nestedCounter));
-    for (String s : parsed.keySet()) {
-      blackhole.consume(parsed.get(s));
+    try (CloseableIterator<InputRow> iterator = nestedFormat.createReader(
+        INPUT_ROW_SCHEMA,
+        new ByteEntity(nestedInputBytes.get(nestedCounter)),
+        null
+    ).read()) {
+      InputRow row = iterator.next();
+      for (String dim : row.getDimensions()) {
+        blackhole.consume(row.getRaw(dim));
+      }
+      nestedCounter = (nestedCounter + 1) % NUM_EVENTS;
+      return row;
     }
-    nestedCounter = (nestedCounter + 1) % NUM_EVENTS;
-    return parsed;
   }
 
   @Benchmark
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.MICROSECONDS)
-  public Map<String, Object> treejqflatten(final Blackhole blackhole)
+  public InputRow treejqflatten(final Blackhole blackhole) throws Exception
   {
-    Map<String, Object> parsed = treeJqParser.parseToMap(nestedInputs.get(jqCounter));
-    for (String s : parsed.keySet()) {
-      blackhole.consume(parsed.get(s));
+    try (CloseableIterator<InputRow> iterator = treeJqFormat.createReader(
+        INPUT_ROW_SCHEMA,
+        new ByteEntity(nestedInputBytes.get(jqCounter)),
+        null
+    ).read()) {
+      InputRow row = iterator.next();
+      for (String dim : row.getDimensions()) {
+        blackhole.consume(row.getRaw(dim));
+      }
+      jqCounter = (jqCounter + 1) % NUM_EVENTS;
+      return row;
     }
-    jqCounter = (jqCounter + 1) % NUM_EVENTS;
-    return parsed;
   }
 
   @Benchmark
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.MICROSECONDS)
-  public Map<String, Object> treetreeflatten(final Blackhole blackhole)
+  public InputRow treetreeflatten(final Blackhole blackhole) throws Exception
   {
-    Map<String, Object> parsed = treeTreeParser.parseToMap(nestedInputs.get(jqCounter));
-    for (String s : parsed.keySet()) {
-      blackhole.consume(parsed.get(s));
+    try (CloseableIterator<InputRow> iterator = treeTreeFormat.createReader(
+        INPUT_ROW_SCHEMA,
+        new ByteEntity(nestedInputBytes.get(jqCounter)),
+        null
+    ).read()) {
+      InputRow row = iterator.next();
+      for (String dim : row.getDimensions()) {
+        blackhole.consume(row.getRaw(dim));
+      }
+      jqCounter = (jqCounter + 1) % NUM_EVENTS;
+      return row;
     }
-    jqCounter = (jqCounter + 1) % NUM_EVENTS;
-    return parsed;
   }
 
   @Benchmark
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.MICROSECONDS)
-  public Map<String, Object> jqflatten(final Blackhole blackhole)
+  public InputRow jqflatten(final Blackhole blackhole) throws Exception
   {
-    Map<String, Object> parsed = jqParser.parseToMap(jqInputs.get(jqCounter));
-    for (String s : parsed.keySet()) {
-      blackhole.consume(parsed.get(s));
+    try (CloseableIterator<InputRow> iterator = jqFormat.createReader(
+        INPUT_ROW_SCHEMA,
+        new ByteEntity(jqInputBytes.get(jqCounter)),
+        null
+    ).read()) {
+      InputRow row = iterator.next();
+      for (String dim : row.getDimensions()) {
+        blackhole.consume(row.getRaw(dim));
+      }
+      jqCounter = (jqCounter + 1) % NUM_EVENTS;
+      return row;
     }
-    jqCounter = (jqCounter + 1) % NUM_EVENTS;
-    return parsed;
   }
 
   @Benchmark
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.MICROSECONDS)
-  public Map<String, Object> preflattenNestedParser(final Blackhole blackhole)
+  public InputRow preflattenNestedParser(final Blackhole blackhole) throws Exception
   {
-    Map<String, Object> parsed = fieldDiscoveryParser.parseToMap(flatInputs.get(nestedCounter));
-    for (String s : parsed.keySet()) {
-      blackhole.consume(parsed.get(s));
+    try (CloseableIterator<InputRow> iterator = fieldDiscoveryFormat.createReader(
+        INPUT_ROW_SCHEMA,
+        new ByteEntity(flatInputBytes.get(nestedCounter)),
+        null
+    ).read()) {
+      InputRow row = iterator.next();
+      for (String dim : row.getDimensions()) {
+        blackhole.consume(row.getRaw(dim));
+      }
+      nestedCounter = (nestedCounter + 1) % NUM_EVENTS;
+      return row;
     }
-    nestedCounter = (nestedCounter + 1) % NUM_EVENTS;
-    return parsed;
   }
 
   @Benchmark
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.MICROSECONDS)
-  public Map<String, Object> forcedRootPaths(final Blackhole blackhole)
+  public InputRow forcedRootPaths(final Blackhole blackhole) throws Exception
   {
-    Map<String, Object> parsed = forcedPathParser.parseToMap(flatInputs.get(nestedCounter));
-    for (String s : parsed.keySet()) {
-      blackhole.consume(parsed.get(s));
+    try (CloseableIterator<InputRow> iterator = forcedPathFormat.createReader(
+        INPUT_ROW_SCHEMA,
+        new ByteEntity(flatInputBytes.get(nestedCounter)),
+        null
+    ).read()) {
+      InputRow row = iterator.next();
+      for (String dim : row.getDimensions()) {
+        blackhole.consume(row.getRaw(dim));
+      }
+      nestedCounter = (nestedCounter + 1) % NUM_EVENTS;
+      return row;
     }
-    nestedCounter = (nestedCounter + 1) % NUM_EVENTS;
-    return parsed;
   }
 
   public static void main(String[] args) throws RunnerException
diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmarkUtil.java b/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmarkUtil.java
index 754f98f59b49..034bed09254e 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmarkUtil.java
+++ b/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmarkUtil.java
@@ -26,13 +26,10 @@
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.wnameless.json.flattener.JsonFlattener;
-import org.apache.druid.data.input.impl.DimensionsSpec;
-import org.apache.druid.data.input.impl.JSONParseSpec;
-import org.apache.druid.data.input.impl.TimestampSpec;
+import org.apache.druid.data.input.impl.JsonInputFormat;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.java.util.common.parsers.JSONPathFieldSpec;
 import org.apache.druid.java.util.common.parsers.JSONPathSpec;
-import org.apache.druid.java.util.common.parsers.Parser;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -52,35 +49,19 @@ public FlattenJSONBenchmarkUtil()
     mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
   }
 
-  public Parser getFlatParser()
+  public JsonInputFormat getFlatFormat()
   {
-    JSONParseSpec spec = new JSONParseSpec(
-        new TimestampSpec("ts", "iso", null),
-        DimensionsSpec.EMPTY,
-        null,
-        null,
-        null
-    );
-    return spec.makeParser();
+    return new JsonInputFormat(null, null, null, null, null);
   }
 
-  public Parser getFieldDiscoveryParser()
+  public JsonInputFormat getFieldDiscoveryFormat()
   {
     List<JSONPathFieldSpec> fields = new ArrayList<>();
     JSONPathSpec flattenSpec = new JSONPathSpec(true, fields);
-
-    JSONParseSpec spec = new JSONParseSpec(
-        new TimestampSpec("ts", "iso", null),
-        DimensionsSpec.EMPTY,
-        flattenSpec,
-        null,
-        null
-    );
-
-    return spec.makeParser();
+    return new JsonInputFormat(flattenSpec, null, null, null, null);
   }
 
-  public Parser getNestedParser()
+  public JsonInputFormat getNestedFormat()
   {
     List<JSONPathFieldSpec> fields = new ArrayList<>();
     fields.add(JSONPathFieldSpec.createRootField("ts"));
@@ -113,18 +94,10 @@ public Parser getNestedParser()
     fields.add(JSONPathFieldSpec.createNestedField("e4.e4.m4", "$.e4.e4.m4"));
 
     JSONPathSpec flattenSpec = new JSONPathSpec(true, fields);
-    JSONParseSpec spec = new JSONParseSpec(
-        new TimestampSpec("ts", "iso", null),
-        DimensionsSpec.EMPTY,
-        flattenSpec,
-        null,
-        null
-    );
-
-    return spec.makeParser();
+    return new JsonInputFormat(flattenSpec, null, null, null, null);
   }
 
-  public Parser getForcedPathParser()
+  public JsonInputFormat getForcedPathFormat()
   {
     List<JSONPathFieldSpec> fields = new ArrayList<>();
     fields.add(JSONPathFieldSpec.createNestedField("ts", "$['ts']"));
@@ -157,18 +130,10 @@ public Parser getForcedPathParser()
     fields.add(JSONPathFieldSpec.createNestedField("e4.e4.m4", "$['e4.e4.m4']"));
 
     JSONPathSpec flattenSpec = new JSONPathSpec(false, fields);
-    JSONParseSpec spec = new JSONParseSpec(
-        new TimestampSpec("ts", "iso", null),
-        DimensionsSpec.EMPTY,
-        flattenSpec,
-        null,
-        null
-    );
-
-    return spec.makeParser();
+    return new JsonInputFormat(flattenSpec, null, null, null, null);
   }
 
-  public Parser getJqParser()
+  public JsonInputFormat getJqFormat()
   {
     List<JSONPathFieldSpec> fields = new ArrayList<>();
     fields.add(JSONPathFieldSpec.createRootField("ts"));
@@ -199,18 +164,10 @@ public Parser getJqParser()
     fields.add(JSONPathFieldSpec.createJqField("e4.e4.m4", ".e4.e4.m4"));
 
     JSONPathSpec flattenSpec = new JSONPathSpec(true, fields);
-    JSONParseSpec spec = new JSONParseSpec(
-        new TimestampSpec("ts", "iso", null),
-        DimensionsSpec.EMPTY,
-        flattenSpec,
-        null,
-        null
-    );
-
-    return spec.makeParser();
+    return new JsonInputFormat(flattenSpec, null, null, null, null);
   }
 
-  public Parser getTreeJqParser()
+  public JsonInputFormat getTreeJqFormat()
   {
     List<JSONPathFieldSpec> fields = new ArrayList<>();
     fields.add(JSONPathFieldSpec.createRootField("ts"));
@@ -230,19 +187,10 @@ public Parser getTreeJqParser()
     fields.add(JSONPathFieldSpec.createJqField("e3.m4", ".e3.m4"));
 
     JSONPathSpec flattenSpec = new JSONPathSpec(false, fields);
-    JSONParseSpec spec = new JSONParseSpec(
-        new TimestampSpec("ts", "iso", null),
-        DimensionsSpec.EMPTY,
-        flattenSpec,
-        null,
-        null
-    );
-
-    return spec.makeParser();
+    return new JsonInputFormat(flattenSpec, null, null, null, null);
   }
 
-
-  public Parser getTreeTreeParser()
+  public JsonInputFormat getTreeTreeFormat()
   {
     List<JSONPathFieldSpec> fields = new ArrayList<>();
     fields.add(JSONPathFieldSpec.createRootField("ts"));
@@ -262,15 +210,7 @@ public Parser getTreeTreeParser()
     fields.add(JSONPathFieldSpec.createTreeField("e3.m4", Arrays.asList("e3", "m4")));
 
     JSONPathSpec flattenSpec = new JSONPathSpec(false, fields);
-    JSONParseSpec spec = new JSONParseSpec(
-        new TimestampSpec("ts", "iso", null),
-        DimensionsSpec.EMPTY,
-        flattenSpec,
-        null,
-        null
-    );
-
-    return spec.makeParser();
+    return new JsonInputFormat(flattenSpec, null, null, null, null);
   }
 
   public String generateFlatEvent() throws Exception
diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmarkUtilTest.java b/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmarkUtilTest.java
index f4b79108f407..c356885b444c 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmarkUtilTest.java
+++ b/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmarkUtilTest.java
@@ -19,109 +19,145 @@
 
 package org.apache.druid.benchmark;
 
-import org.apache.druid.java.util.common.parsers.Parser;
+import org.apache.druid.data.input.ColumnsFilter;
+import org.apache.druid.data.input.InputRow;
+import org.apache.druid.data.input.InputRowSchema;
+import org.apache.druid.data.input.impl.ByteEntity;
+import org.apache.druid.data.input.impl.DimensionsSpec;
+import org.apache.druid.data.input.impl.JsonInputFormat;
+import org.apache.druid.data.input.impl.TimestampSpec;
+import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.java.util.common.parsers.CloseableIterator;
 import org.apache.druid.utils.JvmUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.Map;
-
 public class FlattenJSONBenchmarkUtilTest
 {
+  private static final InputRowSchema INPUT_ROW_SCHEMA = new InputRowSchema(
+      new TimestampSpec("ts", "iso", null),
+      DimensionsSpec.EMPTY,
+      ColumnsFilter.all()
+  );
+
   @Test
   public void testOne() throws Exception
   {
     FlattenJSONBenchmarkUtil eventGen = new FlattenJSONBenchmarkUtil();
 
-    String newEvent = eventGen.generateFlatEvent();
-    String newEvent2 = eventGen.generateNestedEvent();
+    byte[] flatEventBytes = StringUtils.toUtf8(eventGen.generateFlatEvent());
+    byte[] nestedEventBytes = StringUtils.toUtf8(eventGen.generateNestedEvent());
+
+    JsonInputFormat flatFormat = eventGen.getFlatFormat();
+    JsonInputFormat nestedFormat = eventGen.getNestedFormat();
+    JsonInputFormat jqFormat = eventGen.getJqFormat();
+
+    InputRow event;
+    InputRow event2;
+    InputRow event3;
 
-    Parser flatParser = eventGen.getFlatParser();
-    Parser nestedParser = eventGen.getNestedParser();
-    Parser jqParser = eventGen.getJqParser();
+    try (CloseableIterator<InputRow> iterator = flatFormat.createReader(
+        INPUT_ROW_SCHEMA,
+        new ByteEntity(flatEventBytes),
+        null
+    ).read()) {
+      event = iterator.next();
+    }
+
+    try (CloseableIterator<InputRow> iterator = nestedFormat.createReader(
+        INPUT_ROW_SCHEMA,
+        new ByteEntity(nestedEventBytes),
+        null
+    ).read()) {
+      event2 = iterator.next();
+    }
 
-    Map<String, Object> event = flatParser.parseToMap(newEvent);
-    Map<String, Object> event2 = nestedParser.parseToMap(newEvent2);
-    Map<String, Object> event3 = jqParser.parseToMap(newEvent2);  // reuse the same event as "nested"
+    try (CloseableIterator<InputRow> iterator = jqFormat.createReader(
+        INPUT_ROW_SCHEMA,
+        new ByteEntity(nestedEventBytes),
+        null
+    ).read()) {
+      event3 = iterator.next(); // reuse the same event as "nested"
+    }
 
     checkEvent1(event);
     checkEvent2(event2);
-    checkEvent2(event3); // make sure JQ parser output matches with JSONPath parser output
+    checkEvent2(event3); // make sure JQ format output matches with JSONPath format output
   }
 
-  public void checkEvent1(Map<String, Object> event)
+  public void checkEvent1(InputRow event)
   {
-    Assert.assertEquals("2015-09-12T12:10:53.155Z", event.get("ts").toString());
-    Assert.assertEquals("-1170723877", event.get("d1").toString());
-    Assert.assertEquals("238976084", event.get("d2").toString());
-    Assert.assertEquals("0.9818780016507468", event.get("m3").toString());
-    Assert.assertEquals("-3.8218837693501747E18", event.get("m4").toString());
-    Assert.assertEquals("-509091100", event.get("e1.d1").toString());
-    Assert.assertEquals("274706327", event.get("e1.d2").toString());
-    Assert.assertEquals("870378185", event.get("e2.d3").toString());
-    Assert.assertEquals("-377775321", event.get("e2.d4").toString());
-    Assert.assertEquals("-1797988763", event.get("e2.d5").toString());
-    Assert.assertEquals("1309474524", event.get("e2.d6").toString());
-    Assert.assertEquals("129047958", event.get("e2.ad1[0]").toString());
-    Assert.assertEquals("1658972185", event.get("e2.ad1[1]").toString());
-    Assert.assertEquals("-997010830", event.get("e2.ad1[2]").toString());
+    Assert.assertEquals("2015-09-12T12:10:53.155Z", event.getRaw("ts").toString());
+    Assert.assertEquals("-1170723877", event.getRaw("d1").toString());
+    Assert.assertEquals("238976084", event.getRaw("d2").toString());
+    Assert.assertEquals("0.9818780016507468", event.getRaw("m3").toString());
+    Assert.assertEquals("-3.8218837693501747E18", event.getRaw("m4").toString());
+    Assert.assertEquals("-509091100", event.getRaw("e1.d1").toString());
+    Assert.assertEquals("274706327", event.getRaw("e1.d2").toString());
+    Assert.assertEquals("870378185", event.getRaw("e2.d3").toString());
+    Assert.assertEquals("-377775321", event.getRaw("e2.d4").toString());
+    Assert.assertEquals("-1797988763", event.getRaw("e2.d5").toString());
+    Assert.assertEquals("1309474524", event.getRaw("e2.d6").toString());
+    Assert.assertEquals("129047958", event.getRaw("e2.ad1[0]").toString());
+    Assert.assertEquals("1658972185", event.getRaw("e2.ad1[1]").toString());
+    Assert.assertEquals("-997010830", event.getRaw("e2.ad1[2]").toString());
 
     // Java 19 changes some floating point string representation
     // https://bugs.openjdk.org/browse/JDK-8291475
     if (JvmUtils.majorVersion() < 19) {
-      Assert.assertEquals("-5.8772014847368817E18", event.get("e3.m1").toString());
+      Assert.assertEquals("-5.8772014847368817E18", event.getRaw("e3.m1").toString());
     } else {
-      Assert.assertEquals("-5.877201484736882E18", event.get("e3.m1").toString());
+      Assert.assertEquals("-5.877201484736882E18", event.getRaw("e3.m1").toString());
     }
 
-    Assert.assertEquals("0.4375433369079904", event.get("e3.m2").toString());
-    Assert.assertEquals("0.8510482953607659", event.get("e3.m3").toString());
-    Assert.assertEquals("-2.3832626488759337E18", event.get("e3.m4").toString());
+    Assert.assertEquals("0.4375433369079904", event.getRaw("e3.m2").toString());
+    Assert.assertEquals("0.8510482953607659", event.getRaw("e3.m3").toString());
+    Assert.assertEquals("-2.3832626488759337E18", event.getRaw("e3.m4").toString());
     if (JvmUtils.majorVersion() < 19) {
-      Assert.assertEquals("7.9789762132607068E18", event.get("e3.am1[0]").toString());
-      Assert.assertEquals("-7.8634787235005573E18", event.get("e3.am1[1]").toString());
-      Assert.assertEquals("8.7372945568982446E18", event.get("e3.am1[2]").toString());
-      Assert.assertEquals("3.1928124802414899E18", event.get("e3.am1[3]").toString());
-      Assert.assertEquals("-3.9806631713718011E18", event.get("e4.e4.m4").toString());
+      Assert.assertEquals("7.9789762132607068E18", event.getRaw("e3.am1[0]").toString());
+      Assert.assertEquals("-7.8634787235005573E18", event.getRaw("e3.am1[1]").toString());
+      Assert.assertEquals("8.7372945568982446E18", event.getRaw("e3.am1[2]").toString());
+      Assert.assertEquals("3.1928124802414899E18", event.getRaw("e3.am1[3]").toString());
+      Assert.assertEquals("-3.9806631713718011E18", event.getRaw("e4.e4.m4").toString());
     } else {
-      Assert.assertEquals("7.978976213260707E18", event.get("e3.am1[0]").toString());
-      Assert.assertEquals("-7.863478723500557E18", event.get("e3.am1[1]").toString());
-      Assert.assertEquals("8.737294556898245E18", event.get("e3.am1[2]").toString());
-      Assert.assertEquals("3.19281248024149E18", event.get("e3.am1[3]").toString());
-      Assert.assertEquals("-3.980663171371801E18", event.get("e4.e4.m4").toString());
+      Assert.assertEquals("7.978976213260707E18", event.getRaw("e3.am1[0]").toString());
+      Assert.assertEquals("-7.863478723500557E18", event.getRaw("e3.am1[1]").toString());
+      Assert.assertEquals("8.737294556898245E18", event.getRaw("e3.am1[2]").toString());
+      Assert.assertEquals("3.19281248024149E18", event.getRaw("e3.am1[3]").toString());
+      Assert.assertEquals("-3.980663171371801E18", event.getRaw("e4.e4.m4").toString());
     }
-    Assert.assertEquals("-1915243040", event.get("ae1[0].d1").toString());
-    Assert.assertEquals("-2020543641", event.get("ae1[1].d1").toString());
-    Assert.assertEquals("1414285347", event.get("ae1[2].e1.d2").toString());
+    Assert.assertEquals("-1915243040", event.getRaw("ae1[0].d1").toString());
+    Assert.assertEquals("-2020543641", event.getRaw("ae1[1].d1").toString());
+    Assert.assertEquals("1414285347", event.getRaw("ae1[2].e1.d2").toString());
   }
 
-  public void checkEvent2(Map<String, Object> event2)
+  public void checkEvent2(InputRow event2)
   {
-    Assert.assertEquals("728062074", event2.get("ae1[0].d1").toString());
-    Assert.assertEquals("1701675101", event2.get("ae1[1].d1").toString());
-    Assert.assertEquals("1887775139", event2.get("ae1[2].e1.d2").toString());
-    Assert.assertEquals("1375814994", event2.get("e1.d1").toString());
-    Assert.assertEquals("-1747933975", event2.get("e1.d2").toString());
-    Assert.assertEquals("1616761116", event2.get("e2.ad1[0]").toString());
-    Assert.assertEquals("7645432", event2.get("e2.ad1[1]").toString());
-    Assert.assertEquals("679897970", event2.get("e2.ad1[2]").toString());
-    Assert.assertEquals("-1797792200", event2.get("e2.d3").toString());
-    Assert.assertEquals("142582995", event2.get("e2.d4").toString());
-    Assert.assertEquals("-1341994709", event2.get("e2.d5").toString());
-    Assert.assertEquals("-889954295", event2.get("e2.d6").toString());
-    Assert.assertEquals("678995794", event2.get("d1").toString());
-    Assert.assertEquals("-1744549866", event2.get("d2").toString());
-    Assert.assertEquals("2015-09-12T12:10:53.155Z", event2.get("ts").toString());
-    Assert.assertEquals("0.7279915615037622", event2.get("m3").toString());
-    Assert.assertEquals("977083178034247050", event2.get("m4").toString());
-    Assert.assertEquals("1940993614184952155", event2.get("e3.m1").toString());
-    Assert.assertEquals("0.55936084127688", event2.get("e3.m2").toString());
-    Assert.assertEquals("0.22821798320943232", event2.get("e3.m3").toString());
-    Assert.assertEquals("8176144126231114468", event2.get("e3.m4").toString());
-    Assert.assertEquals("-7405674050450245158", event2.get("e3.am1[0]").toString());
-    Assert.assertEquals("150970357863018887", event2.get("e3.am1[1]").toString());
-    Assert.assertEquals("3261802881806411610", event2.get("e3.am1[2]").toString());
-    Assert.assertEquals("8492292414932401114", event2.get("e3.am1[3]").toString());
-    Assert.assertEquals("-1192952196729165097", event2.get("e4.e4.m4").toString());
+    Assert.assertEquals("728062074", event2.getRaw("ae1[0].d1").toString());
+    Assert.assertEquals("1701675101", event2.getRaw("ae1[1].d1").toString());
+    Assert.assertEquals("1887775139", event2.getRaw("ae1[2].e1.d2").toString());
+    Assert.assertEquals("1375814994", event2.getRaw("e1.d1").toString());
+    Assert.assertEquals("-1747933975", event2.getRaw("e1.d2").toString());
+    Assert.assertEquals("1616761116", event2.getRaw("e2.ad1[0]").toString());
+    Assert.assertEquals("7645432", event2.getRaw("e2.ad1[1]").toString());
+    Assert.assertEquals("679897970", event2.getRaw("e2.ad1[2]").toString());
+    Assert.assertEquals("-1797792200", event2.getRaw("e2.d3").toString());
+    Assert.assertEquals("142582995", event2.getRaw("e2.d4").toString());
+    Assert.assertEquals("-1341994709", event2.getRaw("e2.d5").toString());
+    Assert.assertEquals("-889954295", event2.getRaw("e2.d6").toString());
+    Assert.assertEquals("678995794", event2.getRaw("d1").toString());
+    Assert.assertEquals("-1744549866", event2.getRaw("d2").toString());
+    Assert.assertEquals("2015-09-12T12:10:53.155Z", event2.getRaw("ts").toString());
+    Assert.assertEquals("0.7279915615037622", event2.getRaw("m3").toString());
+    Assert.assertEquals("977083178034247050", event2.getRaw("m4").toString());
+    Assert.assertEquals("1940993614184952155", event2.getRaw("e3.m1").toString());
+    Assert.assertEquals("0.55936084127688", event2.getRaw("e3.m2").toString());
+    Assert.assertEquals("0.22821798320943232", event2.getRaw("e3.m3").toString());
+    Assert.assertEquals("8176144126231114468", event2.getRaw("e3.m4").toString());
+    Assert.assertEquals("-7405674050450245158", event2.getRaw("e3.am1[0]").toString());
+    Assert.assertEquals("150970357863018887", event2.getRaw("e3.am1[1]").toString());
+    Assert.assertEquals("3261802881806411610", event2.getRaw("e3.am1[2]").toString());
+    Assert.assertEquals("8492292414932401114", event2.getRaw("e3.am1[3]").toString());
+    Assert.assertEquals("-1192952196729165097", event2.getRaw("e4.e4.m4").toString());
   }
 }
diff --git a/docs/configuration/index.md b/docs/configuration/index.md
index 851db47e3a61..15d05d00b9c4 100644
--- a/docs/configuration/index.md
+++ b/docs/configuration/index.md
@@ -676,7 +676,7 @@ the following properties.
 
 |Property|Description|Default|
 |--------|-----------|-------|
-|`druid.javascript.enabled`|Set to "true" to enable JavaScript functionality. This affects the JavaScript parser, filter, extractionFn, aggregator, post-aggregator, router strategy, and worker selection strategy.|false|
+|`druid.javascript.enabled`|Set to "true" to enable JavaScript functionality. This affects the JavaScript filter, extractionFn, aggregator, post-aggregator, router strategy, and worker selection strategy.|false|
 
 :::info
  JavaScript-based functionality is disabled by default. Please refer to the Druid [JavaScript programming guide](../development/javascript.md) for guidelines about using Druid's JavaScript functionality, including instructions on how to enable it.
diff --git a/docs/development/extensions-contrib/influx.md b/docs/development/extensions-contrib/influx.md
index f40db9973fb5..4286d187f471 100644
--- a/docs/development/extensions-contrib/influx.md
+++ b/docs/development/extensions-contrib/influx.md
@@ -1,6 +1,6 @@
 ---
 id: influx
-title: "InfluxDB Line Protocol Parser"
+title: "InfluxDB Line Protocol Input Format"
 ---
 
 <!--
@@ -38,7 +38,7 @@ which contains four parts:
   - measurement: A string indicating the name of the measurement represented (e.g. cpu, network, web_requests)
   - tags: zero or more key-value pairs (i.e. dimensions)
   - measurements: one or more key-value pairs; values can be numeric, boolean, or string
-  - timestamp: nanoseconds since Unix epoch (the parser truncates it to milliseconds)
+  - timestamp: nanoseconds since Unix epoch (the reader truncates it to milliseconds)
 
 The input format extracts these fields into a map, giving the measurement the key `measurement` and the timestamp the key `__ts`. The tag and measurement keys are copied verbatim, so users should take care to avoid name collisions. It is up to the ingestion spec to decide which fields should be treated as dimensions and which should be treated as metrics (typically tags correspond to dimensions and measurements correspond to metrics).
 
diff --git a/docs/development/extensions-core/avro.md b/docs/development/extensions-core/avro.md
index 3dbf9beb7ded..c51c85043750 100644
--- a/docs/development/extensions-core/avro.md
+++ b/docs/development/extensions-core/avro.md
@@ -39,7 +39,7 @@ Druid has two modes for supporting `union` types.
 
 The default mode treats unions as a single value regardless of the type of data populating the union.
 
-If you want to operate on individual members of a union, set `extractUnionsByType` on the Avro parser. This configuration expands union values into nested objects according to the following rules:
+If you want to operate on individual members of a union, set `extractUnionsByType` on the Avro input format. This configuration expands union values into nested objects according to the following rules:
 - Primitive types and unnamed complex types are keyed by their type name, such as `int` and `string`.
 - Complex named types are keyed by their names, this includes `record`, `fixed`, and `enum`.
 - The Avro null type is elided as its value can only ever be null.
@@ -49,13 +49,13 @@ This is safe because an Avro union can only contain a single member of each unna
 You can then access the members of the union with a [flattenSpec](../../ingestion/data-formats.md#flattenspec) like you would for other nested types.
 
 ### Binary types
-The extension returns `bytes` and `fixed` Avro types as base64 encoded strings by default. To decode these types as UTF-8 strings, enable the `binaryAsString` option on the Avro parser.
+The extension returns `bytes` and `fixed` Avro types as base64 encoded strings by default. To decode these types as UTF-8 strings, enable the `binaryAsString` option on the Avro input format.
 
 ### Enums
 The extension returns `enum` types as `string` of the enum symbol.
 
 ### Complex types
-You can ingest `record` and `map` types representing nested data with a [flattenSpec](../../ingestion/data-formats.md#flattenspec) on the parser.
+You can ingest `record` and `map` types representing nested data with a [flattenSpec](../../ingestion/data-formats.md#flattenspec) on the input format.
 
 ### Logical types
 Druid does not currently support Avro logical types. It ignores them and handles fields according to the underlying primitive type.
diff --git a/docs/development/javascript.md b/docs/development/javascript.md
index da1cd1134256..4c3fc3dc21b1 100644
--- a/docs/development/javascript.md
+++ b/docs/development/javascript.md
@@ -34,7 +34,6 @@ JavaScript can be used to extend Druid in a variety of ways:
 - [Extraction functions](../querying/dimensionspecs.md#javascript-extraction-function)
 - [Filters](../querying/filters.md#javascript-filter)
 - [Post-aggregators](../querying/post-aggregations.md#javascript-post-aggregator)
-- [Input parsers](../ingestion/data-formats.md#javascript-parsespec)
 - [Router strategy](../design/router.md#javascript)
 - [Worker select strategy](../configuration/index.md#javascript-1)
 
diff --git a/docs/ingestion/data-formats.md b/docs/ingestion/data-formats.md
index c238117ea497..9d833b4ef5a7 100644
--- a/docs/ingestion/data-formats.md
+++ b/docs/ingestion/data-formats.md
@@ -70,17 +70,13 @@ Besides text formats, Druid also supports binary formats such as [Orc](#orc) and
 
 ## Custom formats
 
-Druid supports custom data formats and can use the Regex parser or the JavaScript parsers to parse these formats. Using any of these parsers for
-parsing data is less efficient than writing a native Java parser or using an external stream processor. We welcome contributions of new parsers.
+Druid supports custom text data formats and can use the Regex input format to parse them. However, be aware doing this to
+parse data is less efficient than writing a native Java `InputFormat` extension, or using an external stream processor. We welcome contributions of new input formats.
 
 ## Input format
 
 You can use the `inputFormat` field to specify the data format for your input data.
 
-:::info
- `inputFormat` doesn't support all data formats or ingestion methods supported by Druid.
-:::
-
 All forms of Druid ingestion require some form of schema object. The format of the data to be ingested is specified using the `inputFormat` entry in your [`ioConfig`](ingestion-spec.md#ioconfig).
 
 ### JSON
@@ -954,223 +950,3 @@ Each entry in the `fields` list can have the following components:
   | concat(X)  | Provides a concatenated version of the path output with a new item  | like input  | &#10003;  |  &#10007;   |   &#10007;   | &#10007;   |
   | append(X)  | add an item to the json path output array                           | like input  | &#10003;  |  &#10007;   |   &#10007;   | &#10007;   |
   | keys()     | Provides the property keys (An alternative for terminal tilde ~)    | Set\<E\>      | &#10007;  |  &#10007;   |   &#10007;   | &#10007;   |
-
-## Parser
-
-:::info
- The Parser is used for [Apache Hadoop batch tasks](./hadoop.md), which is deprecated.
-:::
-
-This section lists all default and core extension parsers.
-For community extension parsers, please see our [community extensions list](../configuration/extensions.md#community-extensions).
-
-### String Parser
-
-`string` typed parsers operate on text based inputs that can be split into individual records by newlines.
-Each line can be further parsed using [`parseSpec`](#parsespec).
-
-| Field | Type | Description | Required |
-|-------|------|-------------|----------|
-| type | String | Set value to `string` for most cases. | yes |
-| parseSpec | JSON Object | Specifies the format, timestamp, and dimensions of the data. | yes |
-
-
-
-## ParseSpec
-
-:::info
- The Parser is deprecated for [native batch tasks](./native-batch.md), [Kafka indexing service](../ingestion/kafka-ingestion.md),
-and [Kinesis indexing service](../ingestion/kinesis-ingestion.md).
-Consider using the [input format](#input-format) instead for these types of ingestion.
-:::
-
-ParseSpecs serve two purposes:
-
-- The String Parser use them to determine the format (i.e., JSON, CSV, TSV) of incoming rows.
-- All Parsers use them to determine the timestamp and dimensions of incoming rows.
-
-If `format` is not included, the parseSpec defaults to `tsv`.
-
-### JSON ParseSpec
-
-Use this with the String Parser to load JSON.
-
-| Field | Type | Description | Required |
-|-------|------|-------------|----------|
-| format | String |`json`| no |
-| timestampSpec | JSON Object | Specifies the column and format of the timestamp. | yes |
-| dimensionsSpec | JSON Object | Specifies the dimensions of the data. | yes |
-| flattenSpec | JSON Object | Specifies flattening configuration for nested JSON data. See [`flattenSpec`](#flattenspec) for more info. | no |
-
-Sample spec:
-
-```json
-"parseSpec": {
-  "format" : "json",
-  "timestampSpec" : {
-    "column" : "timestamp"
-  },
-  "dimensionSpec" : {
-    "dimensions" : ["page","language","user","unpatrolled","newPage","robot","anonymous","namespace","continent","country","region","city"]
-  }
-}
-```
-
-### JSON Lowercase ParseSpec
-
-:::info
- The _jsonLowercase_ parser is deprecated and may be removed in a future version of Druid.
-:::
-
-This is a special variation of the JSON ParseSpec that lower cases all the column names in the incoming JSON data. This parseSpec is required if you are updating to Druid 0.7.x from Druid 0.6.x, are directly ingesting JSON with mixed case column names, do not have any ETL in place to lower case those column names, and would like to make queries that include the data you created using 0.6.x and 0.7.x.
-
-| Field | Type | Description | Required |
-|-------|------|-------------|----------|
-| format | String | `jsonLowercase` | yes |
-| timestampSpec | JSON Object | Specifies the column and format of the timestamp. | yes |
-| dimensionsSpec | JSON Object | Specifies the dimensions of the data. | yes |
-
-### CSV ParseSpec
-
-Use this with the String Parser to load CSV. Strings are parsed using the com.opencsv library.
-
-| Field | Type | Description | Required |
-|-------|------|-------------|----------|
-| format | String | `csv` | yes |
-| timestampSpec | JSON Object | Specifies the column and format of the timestamp. | yes |
-| dimensionsSpec | JSON Object | Specifies the dimensions of the data. | yes |
-| listDelimiter | String | A custom delimiter for multi-value dimensions. | no (default = ctrl+A) |
-| columns | JSON array | Specifies the columns of the data. | yes |
-
-Sample spec:
-
-```json
-"parseSpec": {
-  "format" : "csv",
-  "timestampSpec" : {
-    "column" : "timestamp"
-  },
-  "columns" : ["timestamp","page","language","user","unpatrolled","newPage","robot","anonymous","namespace","continent","country","region","city","added","deleted","delta"],
-  "dimensionsSpec" : {
-    "dimensions" : ["page","language","user","unpatrolled","newPage","robot","anonymous","namespace","continent","country","region","city"]
-  }
-}
-```
-
-#### CSV Index Tasks
-
-If your input files contain a header, the `columns` field is optional and you don't need to set.
-Instead, you can set the `hasHeaderRow` field to true, which makes Druid automatically extract the column information from the header.
-Otherwise, you must set the `columns` field and ensure that field must match the columns of your input data in the same order.
-
-Also, you can skip some header rows by setting `skipHeaderRows` in your parseSpec. If both `skipHeaderRows` and `hasHeaderRow` options are set,
-`skipHeaderRows` is first applied. For example, if you set `skipHeaderRows` to 2 and `hasHeaderRow` to true, Druid will
-skip the first two lines and then extract column information from the third line.
-
-Note that `hasHeaderRow` and `skipHeaderRows` are effective only for batch index tasks. Other types of index
-tasks will fail with an exception.
-
-#### Other CSV Ingestion Tasks
-
-The `columns` field must be included and and ensure that the order of the fields matches the columns of your input data in the same order.
-
-### TSV / Delimited ParseSpec
-
-Use this with the String Parser to load any delimited text that does not require special escaping. By default,
-the delimiter is a tab, so this will load TSV.
-
-| Field | Type | Description | Required |
-|-------|------|-------------|----------|
-| format | String | `tsv` | yes |
-| timestampSpec | JSON Object | Specifies the column and format of the timestamp. | yes |
-| dimensionsSpec | JSON Object | Specifies the dimensions of the data. | yes |
-| delimiter | String | A custom delimiter for data values. | no (default = \t) |
-| listDelimiter | String | A custom delimiter for multi-value dimensions. | no (default = ctrl+A) |
-| columns | JSON String array | Specifies the columns of the data. | yes |
-
-Sample spec:
-
-```json
-"parseSpec": {
-  "format" : "tsv",
-  "timestampSpec" : {
-    "column" : "timestamp"
-  },
-  "columns" : ["timestamp","page","language","user","unpatrolled","newPage","robot","anonymous","namespace","continent","country","region","city","added","deleted","delta"],
-  "delimiter":"|",
-  "dimensionsSpec" : {
-    "dimensions" : ["page","language","user","unpatrolled","newPage","robot","anonymous","namespace","continent","country","region","city"]
-  }
-}
-```
-
-Be sure to change the `delimiter` to the appropriate delimiter for your data. Like CSV, you must specify the columns and which subset of the columns you want indexed.
-
-#### TSV (Delimited) Index Tasks
-
-If your input files contain a header, the `columns` field is optional and doesn't need to be set.
-Instead, you can set the `hasHeaderRow` field to true, which makes Druid automatically extract the column information from the header.
-Otherwise, you must set the `columns` field and ensure that field must match the columns of your input data in the same order.
-
-Also, you can skip some header rows by setting `skipHeaderRows` in your parseSpec. If both `skipHeaderRows` and `hasHeaderRow` options are set,
-`skipHeaderRows` is first applied. For example, if you set `skipHeaderRows` to 2 and `hasHeaderRow` to true, Druid will
-skip the first two lines and then extract column information from the third line.
-
-Note that `hasHeaderRow` and `skipHeaderRows` are effective only for batch index tasks. Other types of index
-tasks will fail with an exception.
-
-#### Other TSV (Delimited) Ingestion Tasks
-
-The `columns` field must be included and and ensure that the order of the fields matches the columns of your input data in the same order.
-
-### Regex ParseSpec
-
-```json
-"parseSpec":{
-  "format" : "regex",
-  "timestampSpec" : {
-    "column" : "timestamp"
-  },
-  "dimensionsSpec" : {
-    "dimensions" : [<your_list_of_dimensions>]
-  },
-  "columns" : [<your_columns_here>],
-  "pattern" : <regex pattern for partitioning data>
-}
-```
-
-The `columns` field must match the columns of your regex matching groups in the same order. If columns are not provided, default
-columns names ("column_1", "column2", ... "column_n") will be assigned. Ensure that your column names include all your dimensions.
-
-### JavaScript ParseSpec
-
-```json
-"parseSpec":{
-  "format" : "javascript",
-  "timestampSpec" : {
-    "column" : "timestamp"
-  },
-  "dimensionsSpec" : {
-    "dimensions" : ["page","language","user","unpatrolled","newPage","robot","anonymous","namespace","continent","country","region","city"]
-  },
-  "function" : "function(str) { var parts = str.split(\"-\"); return { one: parts[0], two: parts[1] } }"
-}
-```
-
-Note with the JavaScript parser that data must be fully parsed and returned as a `{key:value}` format in the JS logic.
-This means any flattening or parsing multi-dimensional values must be done here.
-
-:::info
- JavaScript-based functionality is disabled by default. Please refer to the Druid [JavaScript programming guide](../development/javascript.md) for guidelines about using Druid's JavaScript functionality, including instructions on how to enable it.
-:::
-
-### TimeAndDims ParseSpec
-
-Use this with non-String Parsers to provide them with timestamp and dimensions information. Non-String Parsers
-handle all formatting decisions on their own, without using the ParseSpec.
-
-| Field | Type | Description | Required |
-|-------|------|-------------|----------|
-| format | String | `timeAndDims` | yes |
-| timestampSpec | JSON Object | Specifies the column and format of the timestamp. | yes |
-| dimensionsSpec | JSON Object | Specifies the dimensions of the data. | yes |
diff --git a/docs/ingestion/ingestion-spec.md b/docs/ingestion/ingestion-spec.md
index b2a0e41f48d7..d1f901cc9538 100644
--- a/docs/ingestion/ingestion-spec.md
+++ b/docs/ingestion/ingestion-spec.md
@@ -437,58 +437,6 @@ Projections you define become a dimension for your datasource. To remove a proje
 }
 ```
 
-### Legacy `dataSchema` spec
-
-The legacy `dataSchema` spec has below two more components in addition to the ones listed in the [`dataSchema`](#dataschema) section above.
-
-- [input row parser](#parser-deprecated), [flattening of nested data](#flattenspec) (if needed)
-
-#### `parser` (Deprecated)
-
-In legacy `dataSchema`, the `parser` is located in the `dataSchema` → `parser` and is responsible for configuring a wide variety of
-items related to parsing input records. The `parser` is only supported by Hadoop ingestion, and is deprecated.
-For details about supported `parser` types, see the ["Data formats" page](data-formats.md).
-
-For details about major components of the `parseSpec`, refer to their subsections:
-
-- [`timestampSpec`](#timestampspec), responsible for configuring the [primary timestamp](./schema-model.md#primary-timestamp).
-- [`dimensionsSpec`](#dimensionsspec), responsible for configuring [dimensions](./schema-model.md#dimensions).
-- [`flattenSpec`](#flattenspec), responsible for flattening nested data formats.
-
-An example `parser` is:
-
-```
-"parser": {
-  "type": "string",
-  "parseSpec": {
-    "format": "json",
-    "flattenSpec": {
-      "useFieldDiscovery": true,
-      "fields": [
-        { "type": "path", "name": "userId", "expr": "$.user.id" }
-      ]
-    },
-    "timestampSpec": {
-      "column": "timestamp",
-      "format": "auto"
-    },
-    "dimensionsSpec": {
-      "dimensions": [
-        "page",
-        "language",
-        { "type": "long", "name": "userId" }
-      ]
-    }
-  }
-}
-```
-
-#### `flattenSpec`
-
-In the legacy `dataSchema`, the `flattenSpec` is located in `dataSchema` → `parser` → `parseSpec` → `flattenSpec` and is responsible for
-bridging the gap between potentially nested input data (such as JSON, Avro, etc) and Druid's flat data model.
-See [Flatten spec](./data-formats.md#flattenspec) for more details.
-
 ## `ioConfig`
 
 The `ioConfig` influences how data is read from a source system, such as Apache Kafka, Amazon S3, a mounted
diff --git a/docs/ingestion/schema-design.md b/docs/ingestion/schema-design.md
index 25b84a9a4d43..1bee014dadef 100644
--- a/docs/ingestion/schema-design.md
+++ b/docs/ingestion/schema-design.md
@@ -121,7 +121,7 @@ you must be more explicit. Druid columns have types specific upfront.
 Tips for modeling log data in Druid:
 
 * If you don't know ahead of time what columns to ingest, you can have Druid perform [schema auto-discovery](#schema-auto-discovery-for-dimensions).
-* If you have nested data, you can ingest it using the [nested columns](../querying/nested-columns.md) feature or flatten it using a [`flattenSpec`](./ingestion-spec.md#flattenspec).
+* If you have nested data, you can ingest it using the [nested columns](../querying/nested-columns.md) feature or flatten it using a [`flattenSpec`](./data-formats.md#flattenspec).
 * Consider enabling [rollup](./rollup.md) if you have mainly analytical use cases for your log data. This will
 mean you lose the ability to retrieve individual events from Druid, but you potentially gain substantial compression and
 query performance boosts.
@@ -210,7 +210,7 @@ then before indexing it, you should transform it to:
 { "foo_bar": 3 }
 ```
 
-See the [`flattenSpec`](./ingestion-spec.md#flattenspec) documentation for more details.
+See the [`flattenSpec`](./data-formats.md#flattenspec) documentation for more details.
 
 <a name="counting"></a>
 
diff --git a/docs/ingestion/tasks.md b/docs/ingestion/tasks.md
index 2e6cb771bc8b..dab31e9044c7 100644
--- a/docs/ingestion/tasks.md
+++ b/docs/ingestion/tasks.md
@@ -251,7 +251,7 @@ the `rowStats` map contains information about row counts. There is one entry for
 - `processedBytes`: Total number of uncompressed bytes processed by the task. This reports the total byte size of all rows i.e. even those that are included in `processedWithError`, `unparseable` or `thrownAway`.
 - `processedWithError`: Number of rows that were ingested, but contained a parsing error within one or more columns. This typically occurs where input rows have a parseable structure but invalid types for columns, such as passing in a non-numeric String value for a numeric column.
 - `thrownAway`: Number of rows skipped. This includes rows with timestamps that were outside of the ingestion task's defined time interval and rows that were filtered out with a [`transformSpec`](ingestion-spec.md#transformspec), but doesn't include the rows skipped by explicit user configurations. For example, the rows skipped by `skipHeaderRows` or `hasHeaderRow` in the CSV format are not counted.
-- `unparseable`: Number of rows that could not be parsed at all and were discarded. This tracks input rows without a parseable structure, such as passing in non-JSON data when using a JSON parser.
+- `unparseable`: Number of rows that could not be parsed at all and were discarded. This tracks input rows without a parseable structure, such as passing in non-JSON data when using a JSON input format.
 
 The `errorMsg` field shows a message describing the error that caused a task to fail. It will be null if the task was successful.
 
diff --git a/docs/tutorials/tutorial-batch-native.md b/docs/tutorials/tutorial-batch-native.md
index e264b27b5763..012af22b86b3 100644
--- a/docs/tutorials/tutorial-batch-native.md
+++ b/docs/tutorials/tutorial-batch-native.md
@@ -77,7 +77,7 @@ in the Druid root directory represents Wikipedia page edits for a given day.
    Feel free to select other **Input format** options to get a sense of their configuration settings 
    and how Druid parses other types of data.  
 
-6. With the JSON parser selected, click **Next: Parse time**. The **Parse time** settings are where you view and adjust the 
+6. With the JSON input format selected, click **Next: Parse time**. The **Parse time** settings are where you view and adjust the 
    primary timestamp column for the data.
 
    ![Data loader parse time](../assets/tutorial-batch-data-loader-04.png "Data loader parse time")
diff --git a/docs/tutorials/tutorial-ingestion-spec.md b/docs/tutorials/tutorial-ingestion-spec.md
index 2e59a01ec071..67324cb19ebf 100644
--- a/docs/tutorials/tutorial-ingestion-spec.md
+++ b/docs/tutorials/tutorial-ingestion-spec.md
@@ -222,8 +222,6 @@ When defining a metric, it is necessary to specify what type of aggregation shou
 
 Here we have defined long sum aggregations on the two long metric columns, `packets` and `bytes`, and a double sum aggregation for the `cost` column.
 
-Note that the `metricsSpec` is on a different nesting level than `dimensionSpec` or `parseSpec`; it belongs on the same nesting level as `parser` within the `dataSchema`.
-
 Note that we have also defined a `count` aggregator. The count aggregator will track how many rows in the original input data contributed to a "rolled up" row in the final ingested data.
 
 ### No rollup
@@ -248,7 +246,7 @@ If we were not using rollup, all columns would be specified in the `dimensionsSp
 
 ### Define granularities
 
-At this point, we are done defining the `parser` and `metricsSpec` within the `dataSchema` and we are almost done writing the ingestion spec.
+At this point, we are done defining the `dimensionsSpec` and `metricsSpec` within the `dataSchema` and we are almost done writing the ingestion spec.
 
 There are some additional properties we need to set in the `granularitySpec`:
 * Type of granularitySpec: the `uniform` granularity spec defines segments with uniform interval sizes. For example, all segments cover an hour's worth of data.
diff --git a/docs/tutorials/tutorial-kafka.md b/docs/tutorials/tutorial-kafka.md
index a9cdd99ac1fb..c5ae50aaccb4 100644
--- a/docs/tutorials/tutorial-kafka.md
+++ b/docs/tutorials/tutorial-kafka.md
@@ -114,7 +114,7 @@ To use the console data loader:
 
    ![Data loader parse data](../assets/tutorial-kafka-data-loader-03.png "Data loader parse data")
 
-   The data loader automatically tries to determine the correct parser for the data. For the sample data, it selects input format `json`. You can play around with the different options to get a preview of how Druid parses your data.
+   The data loader automatically tries to determine the correct input format for the data. For the sample data, it selects input format `json`. You can play around with the different options to get a preview of how Druid parses your data.
 
 5. With the `json` input format selected, click **Next: Parse time**. You may need to click **Apply** first.
 
diff --git a/examples/quickstart/protobuf/kafka-metrics-pb.json b/examples/quickstart/protobuf/kafka-metrics-pb.json
deleted file mode 100644
index 0b896a8b9370..000000000000
--- a/examples/quickstart/protobuf/kafka-metrics-pb.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "type": "kafka",
-  "dataSchema": {
-    "dataSource": "metrics-kafka2",
-    "parser": {
-      "type": "protobuf",
-      "descriptor": "file:///tmp/metrics.desc",
-      "protoMessageType": "Metrics",
-      "parseSpec": {
-        "format": "json",
-        "timestampSpec": {
-          "column": "timestamp",
-          "format": "auto"
-        },
-        "dimensionsSpec": {
-          "dimensions": [
-            "unit",
-            "http_method",
-            "http_code",
-            "page",
-            "metricType",
-            "server"
-          ],
-          "dimensionExclusions": [
-            "timestamp",
-            "value"
-          ]
-        }
-      }
-    },
-    "metricsSpec": [
-      {
-        "name": "count",
-        "type": "count"
-      },
-      {
-        "name": "value_sum",
-        "fieldName": "value",
-        "type": "doubleSum"
-      },
-      {
-        "name": "value_min",
-        "fieldName": "value",
-        "type": "doubleMin"
-      },
-      {
-        "name": "value_max",
-        "fieldName": "value",
-        "type": "doubleMax"
-      }
-    ],
-    "granularitySpec": {
-      "type": "uniform",
-      "segmentGranularity": "HOUR",
-      "queryGranularity": "NONE"
-    }
-  },
-  "tuningConfig": {
-    "type": "kafka",
-    "maxRowsPerSegment": 5000000
-  },
-  "ioConfig": {
-    "topic": "metrics_pb",
-    "consumerProperties": {
-      "bootstrap.servers": "localhost:9092"
-    },
-    "taskCount": 1,
-    "replicas": 1,
-    "taskDuration": "PT1H"
-  }
-}
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunBase.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunBase.java
index f847123d8039..a4690f8ec090 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunBase.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunBase.java
@@ -31,12 +31,12 @@
 import org.apache.druid.client.coordinator.CoordinatorClient;
 import org.apache.druid.client.coordinator.NoopCoordinatorClient;
 import org.apache.druid.client.indexing.ClientCompactionTaskGranularitySpec;
-import org.apache.druid.data.input.impl.CSVParseSpec;
+import org.apache.druid.data.input.InputFormat;
+import org.apache.druid.data.input.impl.CsvInputFormat;
 import org.apache.druid.data.input.impl.DimensionSchema;
 import org.apache.druid.data.input.impl.DimensionsSpec;
 import org.apache.druid.data.input.impl.LongDimensionSchema;
 import org.apache.druid.data.input.impl.NewSpatialDimensionSchema;
-import org.apache.druid.data.input.impl.ParseSpec;
 import org.apache.druid.data.input.impl.StringDimensionSchema;
 import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.indexer.TaskState;
@@ -148,13 +148,14 @@
 public abstract class CompactionTaskRunBase
 {
   protected static final String DATA_SOURCE = "test";
-  protected static final ParseSpec DEFAULT_PARSE_SPEC = new CSVParseSpec(
-      new TimestampSpec("ts", "auto", null),
-      new DimensionsSpec(DimensionsSpec.getDefaultSchemas(Arrays.asList("ts", "dim"))),
-      "|",
+  protected static final TimestampSpec DEFAULT_TIMESTAMP_SPEC = new TimestampSpec("ts", "auto", null);
+  protected static final InputFormat DEFAULT_INPUT_FORMAT = new CsvInputFormat(
       Arrays.asList("ts", "dim", "val"),
+      "|",
+      null,
       false,
-      0
+      0,
+      null
   );
   protected static final Granularity DEFAULT_SEGMENT_GRAN = Granularities.HOUR;
   protected static final Granularity DEFAULT_QUERY_GRAN = Granularities.MINUTE;
@@ -500,7 +501,9 @@ public void testRunIndexAndCompactAtTheSameTimeForDifferentInterval() throws Exc
     rows.add("2014-01-01T08:00:30Z,b,2\n");
     rows.add("2014-01-01T08:00:30Z,c,3\n");
     final IndexTask indexTask = buildIndexTask(
-        DEFAULT_PARSE_SPEC,
+        DEFAULT_TIMESTAMP_SPEC,
+        DEFAULT_DIMENSIONS_SPEC,
+        DEFAULT_INPUT_FORMAT,
         rows,
         Intervals.of("2014-01-01T06:00:00Z/2014-01-01T12:00:00Z"),
         false
@@ -1209,22 +1212,19 @@ public void testRunWithSpatialDimensions() throws Exception
         "2014-01-01T01:00:20Z,b,20,110,2\n",
         "2014-01-01T01:00:20Z,c,30,120,3\n"
     );
-    final ParseSpec spatialSpec = new CSVParseSpec(
-        new TimestampSpec("ts", "auto", null),
-        DimensionsSpec.builder()
-                      .setDimensions(Arrays.asList(
-                          new StringDimensionSchema("ts"),
-                          new StringDimensionSchema("dim"),
-                          new NewSpatialDimensionSchema("spatial", Arrays.asList("x", "y"))
-                      ))
-                      .build(),
-        "|",
-        Arrays.asList("ts", "dim", "x", "y", "val"),
-        false,
-        0
+    final TimestampSpec spatialTimestampSpec = new TimestampSpec("ts", "auto", null);
+    final DimensionsSpec spatialDimensionsSpec = DimensionsSpec.builder()
+        .setDimensions(Arrays.asList(
+            new StringDimensionSchema("ts"),
+            new StringDimensionSchema("dim"),
+            new NewSpatialDimensionSchema("spatial", Arrays.asList("x", "y"))
+        ))
+        .build();
+    final InputFormat spatialInputFormat = new CsvInputFormat(
+        Arrays.asList("ts", "dim", "x", "y", "val"), "|", null, false, 0, null
     );
     Pair<TaskStatus, DataSegmentsWithSchemas> indexTaskResult = runTask(
-        buildIndexTask(spatialSpec, spatialrows, Intervals.of("2014-01-01T00:00:00Z/2014-01-01T02:00:00Z"), false),
+        buildIndexTask(spatialTimestampSpec, spatialDimensionsSpec, spatialInputFormat, spatialrows, Intervals.of("2014-01-01T00:00:00Z/2014-01-01T02:00:00Z"), false),
         null,
         null
     );
@@ -1319,23 +1319,22 @@ public void testRunWithAutoCastDimensions() throws Exception
         "2014-01-01T01:00:20Z,b,20,110,2\n",
         "2014-01-01T01:00:20Z,c,30,120,3\n"
     );
-    final ParseSpec spec = new CSVParseSpec(
-        new TimestampSpec("ts", "auto", null),
-        DimensionsSpec.builder()
-                      .setDimensions(Arrays.asList(
-                          new AutoTypeColumnSchema("ts", ColumnType.STRING, null),
-                          AutoTypeColumnSchema.of("dim"),
-                          new AutoTypeColumnSchema("x", ColumnType.LONG, null),
-                          new AutoTypeColumnSchema("y", ColumnType.LONG, null)
-                      ))
-                      .build(),
-        "|",
-        Arrays.asList("ts", "dim", "x", "y", "val"),
-        false,
-        0
+    final TimestampSpec specTimestampSpec = new TimestampSpec("ts", "auto", null);
+    final DimensionsSpec specDimensionsSpec = DimensionsSpec.builder()
+        .setDimensions(Arrays.asList(
+            new AutoTypeColumnSchema("ts", ColumnType.STRING, null),
+            AutoTypeColumnSchema.of("dim"),
+            new AutoTypeColumnSchema("x", ColumnType.LONG, null),
+            new AutoTypeColumnSchema("y", ColumnType.LONG, null)
+        ))
+        .build();
+    final InputFormat specInputFormat = new CsvInputFormat(
+        Arrays.asList("ts", "dim", "x", "y", "val"), "|", null, false, 0, null
     );
     Pair<TaskStatus, DataSegmentsWithSchemas> indexTaskResult = runTask(buildIndexTask(
-        spec,
+        specTimestampSpec,
+        specDimensionsSpec,
+        specInputFormat,
         rows,
         Intervals.of("2014-01-01T00:00:00Z/2014-01-01T02:00:00Z"),
         false
@@ -1437,25 +1436,24 @@ public void testRunWithAutoCastDimensionsSortByDimension() throws Exception
         "2014-01-01T00:01:20Z,b,20,110,2\n",
         "2014-01-01T00:01:20Z,c,30,120,3\n"
     );
-    final ParseSpec spec = new CSVParseSpec(
-        new TimestampSpec("ts", "auto", null),
-        DimensionsSpec.builder()
-                      .setDimensions(Arrays.asList(
-                          new AutoTypeColumnSchema("x", ColumnType.LONG, null),
-                          new LongDimensionSchema("__time"),
-                          new AutoTypeColumnSchema("ts", ColumnType.STRING, null),
-                          AutoTypeColumnSchema.of("dim"),
-                          new AutoTypeColumnSchema("y", ColumnType.LONG, null)
-                      ))
-                      .setForceSegmentSortByTime(false)
-                      .build(),
-        "|",
-        Arrays.asList("ts", "dim", "x", "y", "val"),
-        false,
-        0
+    final TimestampSpec timestampSpec = new TimestampSpec("ts", "auto", null);
+    final DimensionsSpec dimensionsSpec = DimensionsSpec.builder()
+        .setDimensions(Arrays.asList(
+            new AutoTypeColumnSchema("x", ColumnType.LONG, null),
+            new LongDimensionSchema("__time"),
+            new AutoTypeColumnSchema("ts", ColumnType.STRING, null),
+            AutoTypeColumnSchema.of("dim"),
+            new AutoTypeColumnSchema("y", ColumnType.LONG, null)
+        ))
+        .setForceSegmentSortByTime(false)
+        .build();
+    final InputFormat inputFormat = new CsvInputFormat(
+        Arrays.asList("ts", "dim", "x", "y", "val"), "|", null, false, 0, null
     );
     Pair<TaskStatus, DataSegmentsWithSchemas> indexTaskResult = runTask(buildIndexTask(
-        spec,
+        timestampSpec,
+        dimensionsSpec,
+        inputFormat,
         rows,
         Intervals.of("2014-01-01T00:00:00Z/2014-01-01T02:00:00Z"),
         false
@@ -1578,25 +1576,29 @@ protected Pair<TaskStatus, DataSegmentsWithSchemas> runIndexTask(
   ) throws Exception
   {
     return runTask(
-        buildIndexTask(DEFAULT_PARSE_SPEC, TEST_ROWS, TEST_INTERVAL, appendToExisting),
+        buildIndexTask(DEFAULT_TIMESTAMP_SPEC, DEFAULT_DIMENSIONS_SPEC, DEFAULT_INPUT_FORMAT, TEST_ROWS, TEST_INTERVAL, appendToExisting),
         readyLatchToCountDown,
         latchToAwaitBeforeRun
     );
   }
 
   protected IndexTask buildIndexTask(
-      ParseSpec parseSpec,
+      TimestampSpec timestampSpec,
+      DimensionsSpec dimensionsSpec,
+      InputFormat inputFormat,
       List<String> rows,
       Interval interval,
       boolean appendToExisting
   ) throws Exception
   {
-    return buildIndexTask(DEFAULT_SEGMENT_GRAN, parseSpec, rows, interval, appendToExisting);
+    return buildIndexTask(DEFAULT_SEGMENT_GRAN, timestampSpec, dimensionsSpec, inputFormat, rows, interval, appendToExisting);
   }
 
   protected IndexTask buildIndexTask(
       Granularity segmentGranularity,
-      ParseSpec parseSpec,
+      TimestampSpec timestampSpec,
+      DimensionsSpec dimensionsSpec,
+      InputFormat inputFormat,
       List<String> rows,
       Interval interval,
       boolean appendToExisting
@@ -1615,7 +1617,9 @@ protected IndexTask buildIndexTask(
         null,
         IndexTaskTest.createIngestionSpec(
             tmpDir,
-            parseSpec,
+            timestampSpec,
+            dimensionsSpec,
+            inputFormat,
             null,
             new UniformGranularitySpec(segmentGranularity, DEFAULT_QUERY_GRAN, List.of(interval)),
             IndexTaskTest.createTuningConfig(2, 2, 2L, null, false, true),
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java
index 986d98d5931c..13e016f2880e 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java
@@ -21,22 +21,18 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 import com.google.common.io.Files;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import org.apache.druid.data.input.InputFormat;
-import org.apache.druid.data.input.impl.CSVParseSpec;
 import org.apache.druid.data.input.impl.CsvInputFormat;
 import org.apache.druid.data.input.impl.DimensionsSpec;
 import org.apache.druid.data.input.impl.FloatDimensionSchema;
-import org.apache.druid.data.input.impl.JSONParseSpec;
 import org.apache.druid.data.input.impl.JsonInputFormat;
 import org.apache.druid.data.input.impl.LocalInputSource;
 import org.apache.druid.data.input.impl.LongDimensionSchema;
-import org.apache.druid.data.input.impl.ParseSpec;
 import org.apache.druid.data.input.impl.StringDimensionSchema;
 import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.indexer.TaskState;
@@ -151,14 +147,6 @@ public class IndexTaskTest extends IngestionTestBase
   private static final DimensionsSpec DEFAULT_DIMENSIONS_SPEC = new DimensionsSpec(
       DimensionsSpec.getDefaultSchemas(Arrays.asList("ts", "dim"))
   );
-  private static final ParseSpec DEFAULT_PARSE_SPEC = new CSVParseSpec(
-      DEFAULT_TIMESTAMP_SPEC,
-      DEFAULT_DIMENSIONS_SPEC,
-      null,
-      Arrays.asList("ts", "dim", "val"),
-      false,
-      0
-  );
   private static final InputFormat DEFAULT_INPUT_FORMAT = new CsvInputFormat(
       Arrays.asList("ts", "dim", "val"),
       null,
@@ -187,13 +175,12 @@ public class IndexTaskTest extends IngestionTestBase
                 )
                 .build();
 
-  @Parameterized.Parameters(name = "{0}, useInputFormatApi={1}")
+  @Parameterized.Parameters(name = "{0}")
   public static Iterable<Object[]> constructorFeeder()
   {
     return ImmutableList.of(
-        new Object[]{LockGranularity.TIME_CHUNK, false},
-        new Object[]{LockGranularity.TIME_CHUNK, true},
-        new Object[]{LockGranularity.SEGMENT, true}
+        new Object[]{LockGranularity.TIME_CHUNK},
+        new Object[]{LockGranularity.SEGMENT}
     );
   }
 
@@ -201,18 +188,16 @@ public static Iterable<Object[]> constructorFeeder()
   private final ObjectMapper jsonMapper;
   private final IndexIO indexIO;
   private final LockGranularity lockGranularity;
-  private final boolean useInputFormatApi;
 
   private SegmentCacheManager segmentCacheManager;
   private TestTaskRunner taskRunner;
   private File tmpDir;
 
-  public IndexTaskTest(LockGranularity lockGranularity, boolean useInputFormatApi)
+  public IndexTaskTest(LockGranularity lockGranularity)
   {
     this.jsonMapper = getObjectMapper();
     this.indexIO = getIndexIO();
     this.lockGranularity = lockGranularity;
-    this.useInputFormatApi = useInputFormatApi;
   }
 
   @Before
@@ -470,29 +455,16 @@ public void testTransformSpec() throws Exception
         )
     );
     final IndexTuningConfig tuningConfig = createTuningConfigWithMaxRowsPerSegment(2, false);
-    final IndexIngestionSpec indexIngestionSpec;
-    if (useInputFormatApi) {
-      indexIngestionSpec = createIngestionSpec(
-          DEFAULT_TIMESTAMP_SPEC,
-          dimensionsSpec,
-          new CsvInputFormat(columns, listDelimiter, null, false, 0, null),
-          transformSpec,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    } else {
-      indexIngestionSpec = createIngestionSpec(
-          tmpDir,
-          new CSVParseSpec(DEFAULT_TIMESTAMP_SPEC, dimensionsSpec, listDelimiter, columns, false, 0),
-          transformSpec,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    }
+    final IndexIngestionSpec indexIngestionSpec = createIngestionSpec(
+        DEFAULT_TIMESTAMP_SPEC,
+        dimensionsSpec,
+        new CsvInputFormat(columns, listDelimiter, null, false, 0, null),
+        transformSpec,
+        null,
+        tuningConfig,
+        false,
+        false
+    );
 
     IndexTask indexTask = createIndexTask(indexIngestionSpec, null);
 
@@ -888,29 +860,16 @@ public void testCSVFileWithHeader() throws Exception
 
     final TimestampSpec timestampSpec = new TimestampSpec("time", "auto", null);
     final IndexTuningConfig tuningConfig = createTuningConfigWithMaxRowsPerSegment(2, true);
-    final IndexIngestionSpec ingestionSpec;
-    if (useInputFormatApi) {
-      ingestionSpec = createIngestionSpec(
-          tmpDir,
-          new CSVParseSpec(timestampSpec, DimensionsSpec.EMPTY, null, null, true, 0),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    } else {
-      ingestionSpec = createIngestionSpec(
-          timestampSpec,
-          DimensionsSpec.EMPTY,
-          new CsvInputFormat(null, null, null, true, 0, null),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    }
+    final IndexIngestionSpec ingestionSpec = createIngestionSpec(
+        timestampSpec,
+        DimensionsSpec.EMPTY,
+        new CsvInputFormat(null, null, null, true, 0, null),
+        null,
+        null,
+        tuningConfig,
+        false,
+        false
+    );
 
     IndexTask indexTask = createIndexTask(
         ingestionSpec,
@@ -938,29 +897,16 @@ public void testCSVFileWithHeaderColumnOverride() throws Exception
     final TimestampSpec timestampSpec = new TimestampSpec("time", "auto", null);
     final List<String> columns = Arrays.asList("time", "dim", "val");
     final IndexTuningConfig tuningConfig = createTuningConfigWithMaxRowsPerSegment(2, true);
-    final IndexIngestionSpec ingestionSpec;
-    if (useInputFormatApi) {
-      ingestionSpec = createIngestionSpec(
-          timestampSpec,
-          DimensionsSpec.EMPTY,
-          new CsvInputFormat(columns, null, null, true, 0, null),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    } else {
-      ingestionSpec = createIngestionSpec(
-          tmpDir,
-          new CSVParseSpec(timestampSpec, DimensionsSpec.EMPTY, null, columns, true, 0),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    }
+    final IndexIngestionSpec ingestionSpec = createIngestionSpec(
+        timestampSpec,
+        DimensionsSpec.EMPTY,
+        new CsvInputFormat(columns, null, null, true, 0, null),
+        null,
+        null,
+        tuningConfig,
+        false,
+        false
+    );
 
     IndexTask indexTask = createIndexTask(
         ingestionSpec,
@@ -1337,29 +1283,16 @@ public void testIgnoreParseException() throws Exception
 
     // GranularitySpec.intervals and numShards must be null to verify reportParseException=false is respected both in
     // IndexTask.determineShardSpecs() and IndexTask.generateAndPublishSegments()
-    final IndexIngestionSpec parseExceptionIgnoreSpec;
-    if (useInputFormatApi) {
-      parseExceptionIgnoreSpec = createIngestionSpec(
-          timestampSpec,
-          DimensionsSpec.EMPTY,
-          new CsvInputFormat(columns, null, null, true, 0, null),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    } else {
-      parseExceptionIgnoreSpec = createIngestionSpec(
-          tmpDir,
-          new CSVParseSpec(timestampSpec, DimensionsSpec.EMPTY, null, columns, true, 0),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    }
+    final IndexIngestionSpec parseExceptionIgnoreSpec = createIngestionSpec(
+        timestampSpec,
+        DimensionsSpec.EMPTY,
+        new CsvInputFormat(columns, null, null, true, 0, null),
+        null,
+        null,
+        tuningConfig,
+        false,
+        false
+    );
 
     IndexTask indexTask = createIndexTask(parseExceptionIgnoreSpec, null);
 
@@ -1385,30 +1318,17 @@ public void testReportParseException() throws Exception
     final List<String> columns = Arrays.asList("time", "dim", "val");
     // report parse exception
     final IndexTuningConfig tuningConfig = createTuningConfig(2, null, null, null, false, true);
-    final IndexIngestionSpec indexIngestionSpec;
+    final IndexIngestionSpec indexIngestionSpec = createIngestionSpec(
+        timestampSpec,
+        DimensionsSpec.EMPTY,
+        new CsvInputFormat(columns, null, null, true, 0, null),
+        null,
+        null,
+        tuningConfig,
+        false,
+        false
+    );
     List<String> expectedMessages;
-    if (useInputFormatApi) {
-      indexIngestionSpec = createIngestionSpec(
-          timestampSpec,
-          DimensionsSpec.EMPTY,
-          new CsvInputFormat(columns, null, null, true, 0, null),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    } else {
-      indexIngestionSpec = createIngestionSpec(
-          tmpDir,
-          new CSVParseSpec(timestampSpec, DimensionsSpec.EMPTY, null, columns, true, 0),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    }
 
     expectedMessages = ImmutableList.of(
         StringUtils.format(
@@ -1471,29 +1391,16 @@ public void testMultipleParseExceptionsSuccess() throws Exception
             new FloatDimensionSchema("dimFloat")
         )
     );
-    final IndexIngestionSpec ingestionSpec;
-    if (useInputFormatApi) {
-      ingestionSpec = createIngestionSpec(
-          timestampSpec,
-          dimensionsSpec,
-          new JsonInputFormat(null, null, null, null, null),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    } else {
-      ingestionSpec = createIngestionSpec(
-          tmpDir,
-          new JSONParseSpec(timestampSpec, dimensionsSpec, null, null, null),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    }
+    final IndexIngestionSpec ingestionSpec = createIngestionSpec(
+        timestampSpec,
+        dimensionsSpec,
+        new JsonInputFormat(null, null, null, null, null),
+        null,
+        null,
+        tuningConfig,
+        false,
+        false
+    );
 
     IndexTask indexTask = createIndexTask(ingestionSpec, null);
 
@@ -1627,33 +1534,18 @@ public void testMultipleParseExceptionsFailure() throws Exception
         )
     );
     final List<String> columns = Arrays.asList("time", "dim", "dimLong", "dimFloat", "val");
-    final IndexIngestionSpec ingestionSpec;
-
-    List<String> expectedMessages;
-    if (useInputFormatApi) {
-      ingestionSpec = createIngestionSpec(
-          timestampSpec,
-          dimensionsSpec,
-          new CsvInputFormat(columns, null, null, true, 0, null),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    } else {
-      ingestionSpec = createIngestionSpec(
-          tmpDir,
-          new CSVParseSpec(timestampSpec, dimensionsSpec, null, columns, true, 0),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    }
+    final IndexIngestionSpec ingestionSpec = createIngestionSpec(
+        timestampSpec,
+        dimensionsSpec,
+        new CsvInputFormat(columns, null, null, true, 0, null),
+        null,
+        null,
+        tuningConfig,
+        false,
+        false
+    );
 
-    expectedMessages = Arrays.asList(
+    List<String> expectedMessages = Arrays.asList(
         StringUtils.format(
             "Timestamp[99999999999-01-01T00:00:10Z] is unparseable! Event: {time=99999999999-01-01T00:00:10Z, dim=b, dimLong=2, dimFloat=3.0, val=1} (Path: %s, Record: 3, Line: 6)",
             tmpFile.toURI()
@@ -1750,33 +1642,18 @@ public void testMultipleParseExceptionsFailureAtDeterminePartitions() throws Exc
         )
     );
     final List<String> columns = Arrays.asList("time", "dim", "dimLong", "dimFloat", "val");
-    final IndexIngestionSpec ingestionSpec;
-
-    List<String> expectedMessages;
-    if (useInputFormatApi) {
-      ingestionSpec = createIngestionSpec(
-          timestampSpec,
-          dimensionsSpec,
-          new CsvInputFormat(columns, null, null, true, 0, null),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    } else {
-      ingestionSpec = createIngestionSpec(
-          tmpDir,
-          new CSVParseSpec(timestampSpec, dimensionsSpec, null, columns, true, 0),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    }
+    final IndexIngestionSpec ingestionSpec = createIngestionSpec(
+        timestampSpec,
+        dimensionsSpec,
+        new CsvInputFormat(columns, null, null, true, 0, null),
+        null,
+        null,
+        tuningConfig,
+        false,
+        false
+    );
 
-    expectedMessages = Arrays.asList(
+    List<String> expectedMessages = Arrays.asList(
         StringUtils.format("Timestamp[99999999999-01-01T00:00:10Z] is unparseable! Event: {time=99999999999-01-01T00:00:10Z, dim=b, dimLong=2, dimFloat=3.0, val=1} (Path: %s, Record: 3, Line: 6)", tmpFile.toURI()),
         StringUtils.format("Timestamp[9.0] is unparseable! Event: {time=9.0, dim=a, dimLong=2, dimFloat=3.0, val=1} (Path: %s, Record: 2, Line: 4)", tmpFile.toURI()),
         StringUtils.format("Timestamp[unparseable] is unparseable! Event: {time=unparseable, dim=a, dimLong=2, dimFloat=3.0, val=1} (Path: %s, Record: 1, Line: 2)", tmpFile.toURI())
@@ -1849,29 +1726,16 @@ public void testCsvWithHeaderOfEmptyColumns() throws Exception
 
     // report parse exception
     final IndexTuningConfig tuningConfig = createTuningConfig(2, 1, null, null, true, true);
-    final IndexIngestionSpec ingestionSpec;
-    if (useInputFormatApi) {
-      ingestionSpec = createIngestionSpec(
-          DEFAULT_TIMESTAMP_SPEC,
-          DimensionsSpec.EMPTY,
-          new CsvInputFormat(null, null, null, true, 0, null),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    } else {
-      ingestionSpec = createIngestionSpec(
-          tmpDir,
-          new CSVParseSpec(DEFAULT_TIMESTAMP_SPEC, DimensionsSpec.EMPTY, null, null, true, 0),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    }
+    final IndexIngestionSpec ingestionSpec = createIngestionSpec(
+        DEFAULT_TIMESTAMP_SPEC,
+        DimensionsSpec.EMPTY,
+        new CsvInputFormat(null, null, null, true, 0, null),
+        null,
+        null,
+        tuningConfig,
+        false,
+        false
+    );
 
     IndexTask indexTask = createIndexTask(
         ingestionSpec,
@@ -1917,32 +1781,17 @@ public void testCsvWithHeaderOfEmptyTimestamp() throws Exception
     final List<String> columns = Arrays.asList("ts", "", "");
     // report parse exception
     final IndexTuningConfig tuningConfig = createTuningConfig(2, null, null, null, false, true);
-    final IndexIngestionSpec ingestionSpec;
-    List<String> expectedMessages;
-    if (useInputFormatApi) {
-      ingestionSpec = createIngestionSpec(
-          DEFAULT_TIMESTAMP_SPEC,
-          DimensionsSpec.EMPTY,
-          new CsvInputFormat(columns, null, null, true, 0, null),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    } else {
-      ingestionSpec = createIngestionSpec(
-          tmpDir,
-          new CSVParseSpec(DEFAULT_TIMESTAMP_SPEC, DimensionsSpec.EMPTY, null, columns, true, 0),
-          null,
-          null,
-          tuningConfig,
-          false,
-          false
-      );
-    }
-
-    expectedMessages = ImmutableList.of(
+    final IndexIngestionSpec ingestionSpec = createIngestionSpec(
+        DEFAULT_TIMESTAMP_SPEC,
+        DimensionsSpec.EMPTY,
+        new CsvInputFormat(columns, null, null, true, 0, null),
+        null,
+        null,
+        tuningConfig,
+        false,
+        false
+    );
+    List<String> expectedMessages = ImmutableList.of(
         StringUtils.format(
             "Timestamp[null] is unparseable! Event: {column_1=2014-01-01T00:00:10Z, column_2=a, column_3=1} (Path: %s, Record: 1, Line: 2)",
             tmpFile.toURI()
@@ -2578,33 +2427,23 @@ private IndexIngestionSpec createDefaultIngestionSpec(
       Boolean dropExisting
   )
   {
-    if (useInputFormatApi) {
-      return createIngestionSpec(
-          DEFAULT_TIMESTAMP_SPEC,
-          DEFAULT_DIMENSIONS_SPEC,
-          DEFAULT_INPUT_FORMAT,
-          null,
-          granularitySpec,
-          tuningConfig,
-          appendToExisting,
-          dropExisting
-      );
-    } else {
-      return createIngestionSpec(
-          tmpDir,
-          DEFAULT_PARSE_SPEC,
-          null,
-          granularitySpec,
-          tuningConfig,
-          appendToExisting,
-          dropExisting
-      );
-    }
+    return createIngestionSpec(
+        DEFAULT_TIMESTAMP_SPEC,
+        DEFAULT_DIMENSIONS_SPEC,
+        DEFAULT_INPUT_FORMAT,
+        null,
+        granularitySpec,
+        tuningConfig,
+        appendToExisting,
+        dropExisting
+    );
   }
 
   static IndexIngestionSpec createIngestionSpec(
       File baseDir,
-      @Nullable ParseSpec parseSpec,
+      TimestampSpec timestampSpec,
+      DimensionsSpec dimensionsSpec,
+      InputFormat inputFormat,
       @Nullable TransformSpec transformSpec,
       @Nullable GranularitySpec granularitySpec,
       IndexTuningConfig tuningConfig,
@@ -2612,17 +2451,28 @@ static IndexIngestionSpec createIngestionSpec(
       Boolean dropExisting
   )
   {
-    return createIngestionSpec(
-        baseDir,
-        parseSpec,
-        null,
-        null,
-        null,
-        transformSpec,
-        granularitySpec,
-        tuningConfig,
-        appendToExisting,
-        dropExisting
+    return new IndexIngestionSpec(
+        DataSchema.builder()
+                  .withDataSource(DATASOURCE)
+                  .withTimestamp(timestampSpec)
+                  .withDimensions(dimensionsSpec)
+                  .withAggregators(new LongSumAggregatorFactory("val", "val"))
+                  .withGranularity(
+                      granularitySpec != null ? granularitySpec : new UniformGranularitySpec(
+                          Granularities.DAY,
+                          Granularities.MINUTE,
+                          Collections.singletonList(Intervals.of("2014/2015"))
+                      )
+                  )
+                  .withTransform(transformSpec)
+                  .build(),
+        new IndexIOConfig(
+            new LocalInputSource(baseDir, "druid*"),
+            inputFormat,
+            appendToExisting,
+            dropExisting
+        ),
+        tuningConfig
     );
   }
 
@@ -2639,7 +2489,6 @@ private IndexIngestionSpec createIngestionSpec(
   {
     return createIngestionSpec(
         tmpDir,
-        null,
         timestampSpec,
         dimensionsSpec,
         inputFormat,
@@ -2651,72 +2500,6 @@ private IndexIngestionSpec createIngestionSpec(
     );
   }
 
-  private static IndexIngestionSpec createIngestionSpec(
-      File baseDir,
-      @Nullable ParseSpec parseSpec,
-      @Nullable TimestampSpec timestampSpec,
-      @Nullable DimensionsSpec dimensionsSpec,
-      @Nullable InputFormat inputFormat,
-      @Nullable TransformSpec transformSpec,
-      @Nullable GranularitySpec granularitySpec,
-      IndexTuningConfig tuningConfig,
-      boolean appendToExisting,
-      Boolean dropExisting
-  )
-  {
-    if (inputFormat != null) {
-      Preconditions.checkArgument(parseSpec == null, "Can't use parseSpec");
-      return new IndexIngestionSpec(
-          DataSchema.builder()
-                    .withDataSource(DATASOURCE)
-                    .withTimestamp(Preconditions.checkNotNull(timestampSpec, "timestampSpec"))
-                    .withDimensions(Preconditions.checkNotNull(dimensionsSpec, "dimensionsSpec"))
-                    .withAggregators(new LongSumAggregatorFactory("val", "val"))
-                    .withGranularity(
-                        granularitySpec != null ? granularitySpec : new UniformGranularitySpec(
-                            Granularities.DAY,
-                            Granularities.MINUTE,
-                            Collections.singletonList(Intervals.of("2014/2015"))
-                        )
-                    )
-                    .withTransform(transformSpec)
-                    .build(),
-          new IndexIOConfig(
-              new LocalInputSource(baseDir, "druid*"),
-              inputFormat,
-              appendToExisting,
-              dropExisting
-          ),
-          tuningConfig
-      );
-    } else {
-      parseSpec = parseSpec != null ? parseSpec : DEFAULT_PARSE_SPEC;
-      return new IndexIngestionSpec(
-          DataSchema.builder()
-                    .withDataSource(DATASOURCE)
-                    .withTimestamp(parseSpec.getTimestampSpec())
-                    .withDimensions(parseSpec.getDimensionsSpec())
-                    .withAggregators(new LongSumAggregatorFactory("val", "val"))
-                    .withGranularity(
-                        granularitySpec != null ? granularitySpec : new UniformGranularitySpec(
-                            Granularities.DAY,
-                            Granularities.MINUTE,
-                            Collections.singletonList(Intervals.of("2014/2015"))
-                        )
-                    )
-                    .withTransform(transformSpec)
-                    .build(),
-          new IndexIOConfig(
-              new LocalInputSource(baseDir, "druid*"),
-              createInputFormatFromParseSpec(parseSpec),
-              appendToExisting,
-              dropExisting
-          ),
-          tuningConfig
-      );
-    }
-  }
-
   @Test
   public void testEqualsAndHashCode()
   {
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IngestionTestBase.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IngestionTestBase.java
index 318631b81e9b..66628d340b5f 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IngestionTestBase.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IngestionTestBase.java
@@ -24,16 +24,6 @@
 import com.google.common.base.Suppliers;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.druid.data.input.InputFormat;
-import org.apache.druid.data.input.impl.CSVParseSpec;
-import org.apache.druid.data.input.impl.CsvInputFormat;
-import org.apache.druid.data.input.impl.DelimitedInputFormat;
-import org.apache.druid.data.input.impl.DelimitedParseSpec;
-import org.apache.druid.data.input.impl.JSONParseSpec;
-import org.apache.druid.data.input.impl.JsonInputFormat;
-import org.apache.druid.data.input.impl.ParseSpec;
-import org.apache.druid.data.input.impl.RegexInputFormat;
-import org.apache.druid.data.input.impl.RegexParseSpec;
 import org.apache.druid.indexer.TaskStatus;
 import org.apache.druid.indexer.report.IngestionStatsAndErrors;
 import org.apache.druid.indexer.report.IngestionStatsAndErrorsTaskReport;
@@ -63,7 +53,6 @@
 import org.apache.druid.indexing.test.TestDataSegmentKiller;
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.Pair;
-import org.apache.druid.java.util.common.RE;
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.java.util.common.concurrent.ScheduledExecutors;
 import org.apache.druid.java.util.emitter.EmittingLogger;
@@ -372,48 +361,6 @@ public IndexMergerV9Factory getIndexMergerV9Factory()
     return testUtils.getIndexMergerV9Factory();
   }
 
-  /**
-   * Converts ParseSpec to InputFormat for indexing tests. Used for backwards compatibility
-   */
-  public static InputFormat createInputFormatFromParseSpec(ParseSpec parseSpec)
-  {
-    if (parseSpec instanceof JSONParseSpec) {
-      JSONParseSpec jsonParseSpec = (JSONParseSpec) parseSpec;
-      return new JsonInputFormat(jsonParseSpec.getFlattenSpec(), jsonParseSpec.getFeatureSpec(), jsonParseSpec.getKeepNullColumns(), null, null);
-    } else if (parseSpec instanceof CSVParseSpec) {
-      CSVParseSpec csvParseSpec = (CSVParseSpec) parseSpec;
-      boolean getColumnsFromHeader = csvParseSpec.isHasHeaderRow() && csvParseSpec.getSkipHeaderRows() == 0;
-      return new CsvInputFormat(
-          csvParseSpec.getColumns(),
-          csvParseSpec.getListDelimiter(),
-          getColumnsFromHeader ? null : true,
-          getColumnsFromHeader ? true : null,
-          csvParseSpec.getSkipHeaderRows(),
-          null
-      );
-    } else if (parseSpec instanceof DelimitedParseSpec) {
-      DelimitedParseSpec delimitedParseSpec = (DelimitedParseSpec) parseSpec;
-      boolean getColumnsFromHeader = delimitedParseSpec.isHasHeaderRow() && delimitedParseSpec.getSkipHeaderRows() == 0;
-      return new DelimitedInputFormat(
-          delimitedParseSpec.getColumns(),
-          delimitedParseSpec.getListDelimiter(),
-          delimitedParseSpec.getDelimiter(),
-          getColumnsFromHeader ? null : true,
-          getColumnsFromHeader ? true : null,
-          delimitedParseSpec.getSkipHeaderRows(),
-          null
-      );
-    } else if (parseSpec instanceof RegexParseSpec) {
-      RegexParseSpec regexParseSpec = (RegexParseSpec) parseSpec;
-      return new RegexInputFormat(
-          regexParseSpec.getPattern(),
-          regexParseSpec.getListDelimiter(),
-          regexParseSpec.getColumns());
-    } else {
-      throw new RE(StringUtils.format("Unsupported ParseSpec format %s", parseSpec.toString()));
-    }
-  }
-
   public class TestLocalTaskActionClientFactory implements TaskActionClientFactory
   {
     @Override
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractMultiPhaseParallelIndexingTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractMultiPhaseParallelIndexingTest.java
index e02dd9324abf..1790c0d36bb5 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractMultiPhaseParallelIndexingTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractMultiPhaseParallelIndexingTest.java
@@ -19,12 +19,10 @@
 
 package org.apache.druid.indexing.common.task.batch.parallel;
 
-import com.google.common.base.Preconditions;
 import org.apache.druid.common.guava.FutureUtils;
 import org.apache.druid.data.input.InputFormat;
 import org.apache.druid.data.input.impl.DimensionsSpec;
 import org.apache.druid.data.input.impl.LocalInputSource;
-import org.apache.druid.data.input.impl.ParseSpec;
 import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.indexer.TaskState;
 import org.apache.druid.indexer.TaskStatus;
@@ -80,18 +78,15 @@ abstract class AbstractMultiPhaseParallelIndexingTest extends AbstractParallelIn
   );
 
   private final LockGranularity lockGranularity;
-  private final boolean useInputFormatApi;
 
   AbstractMultiPhaseParallelIndexingTest(
       LockGranularity lockGranularity,
-      boolean useInputFormatApi,
       double transientTaskFailureRate,
       double transientApiCallFailureRate
   )
   {
     super(transientTaskFailureRate, transientApiCallFailureRate);
     this.lockGranularity = lockGranularity;
-    this.useInputFormatApi = useInputFormatApi;
     getObjectMapper().registerSubtypes(
         ParallelIndexTuningConfig.class,
         DruidInputSource.class,
@@ -99,16 +94,10 @@ abstract class AbstractMultiPhaseParallelIndexingTest extends AbstractParallelIn
     );
   }
 
-  boolean isUseInputFormatApi()
-  {
-    return useInputFormatApi;
-  }
-
   DataSegmentsWithSchemas runTestTask(
       @Nullable TimestampSpec timestampSpec,
       @Nullable DimensionsSpec dimensionsSpec,
       @Nullable InputFormat inputFormat,
-      @Nullable ParseSpec parseSpec,
       Interval interval,
       File inputDir,
       String filter,
@@ -121,7 +110,6 @@ DataSegmentsWithSchemas runTestTask(
         timestampSpec,
         dimensionsSpec,
         inputFormat,
-        parseSpec,
         interval,
         inputDir,
         filter,
@@ -137,7 +125,6 @@ DataSegmentsWithSchemas runTestTask(
       @Nullable TimestampSpec timestampSpec,
       @Nullable DimensionsSpec dimensionsSpec,
       @Nullable InputFormat inputFormat,
-      @Nullable ParseSpec parseSpec,
       Interval interval,
       File inputDirectory,
       String filter,
@@ -152,7 +139,6 @@ DataSegmentsWithSchemas runTestTask(
         timestampSpec,
         dimensionsSpec,
         inputFormat,
-        parseSpec,
         interval,
         inputDirectory,
         filter,
@@ -188,7 +174,6 @@ protected ParallelIndexSupervisorTask createTask(
       @Nullable TimestampSpec timestampSpec,
       @Nullable DimensionsSpec dimensionsSpec,
       @Nullable InputFormat inputFormat,
-      @Nullable ParseSpec parseSpec,
       Interval interval,
       File inputDirectory,
       String filter,
@@ -210,47 +195,23 @@ protected ParallelIndexSupervisorTask createTask(
         !appendToExisting
     );
 
-    final ParallelIndexIngestionSpec ingestionSpec;
-
-    if (useInputFormatApi) {
-      Preconditions.checkArgument(parseSpec == null);
-      ParallelIndexIOConfig ioConfig = new ParallelIndexIOConfig(
-          new LocalInputSource(inputDirectory, filter),
-          inputFormat,
-          appendToExisting,
-          dropExisting
-      );
-      ingestionSpec = new ParallelIndexIngestionSpec(
-          DataSchema.builder()
-                    .withDataSource(DATASOURCE)
-                    .withTimestamp(timestampSpec)
-                    .withDimensions(dimensionsSpec)
-                    .withAggregators(DEFAULT_METRICS_SPEC)
-                    .withGranularity(granularitySpec)
-                    .build(),
-          ioConfig,
-          tuningConfig
-      );
-    } else {
-      Preconditions.checkArgument(inputFormat == null && parseSpec != null);
-      ParallelIndexIOConfig ioConfig = new ParallelIndexIOConfig(
-          new LocalInputSource(inputDirectory, filter),
-          createInputFormatFromParseSpec(parseSpec),
-          appendToExisting,
-          dropExisting
-      );
-      ingestionSpec = new ParallelIndexIngestionSpec(
-          DataSchema.builder()
-                    .withDataSource(DATASOURCE)
-                    .withTimestamp(parseSpec.getTimestampSpec())
-                    .withDimensions(parseSpec.getDimensionsSpec())
-                    .withAggregators(DEFAULT_METRICS_SPEC)
-                    .withGranularity(granularitySpec)
-                    .build(),
-          ioConfig,
-          tuningConfig
-      );
-    }
+    ParallelIndexIOConfig ioConfig = new ParallelIndexIOConfig(
+        new LocalInputSource(inputDirectory, filter),
+        inputFormat,
+        appendToExisting,
+        dropExisting
+    );
+    ParallelIndexIngestionSpec ingestionSpec = new ParallelIndexIngestionSpec(
+        DataSchema.builder()
+                  .withDataSource(DATASOURCE)
+                  .withTimestamp(timestampSpec)
+                  .withDimensions(dimensionsSpec)
+                  .withAggregators(DEFAULT_METRICS_SPEC)
+                  .withGranularity(granularitySpec)
+                  .build(),
+        ioConfig,
+        tuningConfig
+    );
 
     // set up test tools
     return new ParallelIndexSupervisorTask(
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractParallelIndexSupervisorTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractParallelIndexSupervisorTaskTest.java
index 8429ad458385..236d067e53d2 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractParallelIndexSupervisorTaskTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractParallelIndexSupervisorTaskTest.java
@@ -36,10 +36,8 @@
 import org.apache.druid.common.utils.IdUtils;
 import org.apache.druid.data.input.InputFormat;
 import org.apache.druid.data.input.MaxSizeSplitHintSpec;
-import org.apache.druid.data.input.impl.CSVParseSpec;
 import org.apache.druid.data.input.impl.CsvInputFormat;
 import org.apache.druid.data.input.impl.DimensionsSpec;
-import org.apache.druid.data.input.impl.ParseSpec;
 import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.indexer.IngestionState;
 import org.apache.druid.indexer.RunnerTaskState;
@@ -151,14 +149,6 @@ public class AbstractParallelIndexSupervisorTaskTest extends IngestionTestBase
   static final AggregatorFactory[] DEFAULT_METRICS_SPEC = new AggregatorFactory[]{
       new LongSumAggregatorFactory("val", "val")
   };
-  static final ParseSpec DEFAULT_PARSE_SPEC = new CSVParseSpec(
-      DEFAULT_TIMESTAMP_SPEC,
-      DEFAULT_DIMENSIONS_SPEC,
-      null,
-      Arrays.asList("ts", "dim", "val"),
-      false,
-      0
-  );
   static final InputFormat DEFAULT_INPUT_FORMAT = new CsvInputFormat(
       Arrays.asList("ts", "dim", "val"),
       null,
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionAdjustingCorePartitionSizeTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionAdjustingCorePartitionSizeTest.java
index 075dae22f5cf..6cdca94685b8 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionAdjustingCorePartitionSizeTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionAdjustingCorePartitionSizeTest.java
@@ -80,7 +80,7 @@ public static Iterable<Object[]> constructorFeeder()
 
   public HashPartitionAdjustingCorePartitionSizeTest(LockGranularity lockGranularity, int maxNumConcurrentSubTasks)
   {
-    super(lockGranularity, true, DEFAULT_TRANSIENT_TASK_FAILURE_RATE, DEFAULT_TRANSIENT_API_FAILURE_RATE);
+    super(lockGranularity, DEFAULT_TRANSIENT_TASK_FAILURE_RATE, DEFAULT_TRANSIENT_API_FAILURE_RATE);
     this.maxNumConcurrentSubTasks = maxNumConcurrentSubTasks;
   }
 
@@ -104,7 +104,6 @@ public void testLessPartitionsThanBuckets() throws IOException
             TIMESTAMP_SPEC,
             DIMENSIONS_SPEC,
             INPUT_FORMAT,
-            null,
             INTERVAL_TO_INDEX,
             inputDir,
             "test_*",
@@ -146,7 +145,6 @@ public void testEqualNumberOfPartitionsToBuckets() throws IOException
         TIMESTAMP_SPEC,
         DIMENSIONS_SPEC,
         INPUT_FORMAT,
-        null,
         INTERVAL_TO_INDEX,
         inputDir,
         "test_*",
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionMultiPhaseParallelIndexingTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionMultiPhaseParallelIndexingTest.java
index 02797bc10675..8a0b55d1ba16 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionMultiPhaseParallelIndexingTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionMultiPhaseParallelIndexingTest.java
@@ -21,10 +21,8 @@
 
 import com.google.common.collect.ImmutableList;
 import org.apache.druid.data.input.InputFormat;
-import org.apache.druid.data.input.impl.CSVParseSpec;
 import org.apache.druid.data.input.impl.CsvInputFormat;
 import org.apache.druid.data.input.impl.DimensionsSpec;
-import org.apache.druid.data.input.impl.ParseSpec;
 import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.indexer.TaskState;
 import org.apache.druid.indexer.partitions.DynamicPartitionsSpec;
@@ -71,14 +69,6 @@ public class HashPartitionMultiPhaseParallelIndexingTest extends AbstractMultiPh
   private static final DimensionsSpec DIMENSIONS_SPEC = new DimensionsSpec(
       DimensionsSpec.getDefaultSchemas(Arrays.asList("ts", "dim1", "dim2"))
   );
-  private static final ParseSpec PARSE_SPEC = new CSVParseSpec(
-      TIMESTAMP_SPEC,
-      DIMENSIONS_SPEC,
-      null,
-      Arrays.asList("ts", "dim1", "dim2", "val"),
-      false,
-      0
-  );
   private static final InputFormat INPUT_FORMAT = new CsvInputFormat(
       Arrays.asList("ts", "dim1", "dim2", "val"),
       null,
@@ -91,20 +81,19 @@ public class HashPartitionMultiPhaseParallelIndexingTest extends AbstractMultiPh
   private static final String INPUT_FILTER = "test_*";
 
   @Parameterized.Parameters(
-      name = "lockGranularity={0}, useInputFormatApi={1}, maxNumConcurrentSubTasks={2}, intervalToIndex={3}, numShards={4}"
+      name = "lockGranularity={0}, maxNumConcurrentSubTasks={1}, intervalToIndex={2}, numShards={3}"
   )
   public static Iterable<Object[]> constructorFeeder()
   {
     return ImmutableList.of(
-        new Object[]{LockGranularity.TIME_CHUNK, false, 10, INTERVAL_TO_INDEX, 2},
-        new Object[]{LockGranularity.TIME_CHUNK, true, 10, INTERVAL_TO_INDEX, 2},
-        new Object[]{LockGranularity.TIME_CHUNK, true, 10, null, 2},
-        new Object[]{LockGranularity.TIME_CHUNK, true, 1, INTERVAL_TO_INDEX, 2},
-        new Object[]{LockGranularity.SEGMENT, true, 10, INTERVAL_TO_INDEX, 2},
-        new Object[]{LockGranularity.TIME_CHUNK, true, 10, INTERVAL_TO_INDEX, null},
-        new Object[]{LockGranularity.TIME_CHUNK, true, 10, null, null},
-        new Object[]{LockGranularity.TIME_CHUNK, true, 1, INTERVAL_TO_INDEX, null},
-        new Object[]{LockGranularity.SEGMENT, true, 10, INTERVAL_TO_INDEX, null}
+        new Object[]{LockGranularity.TIME_CHUNK, 10, INTERVAL_TO_INDEX, 2},
+        new Object[]{LockGranularity.TIME_CHUNK, 10, null, 2},
+        new Object[]{LockGranularity.TIME_CHUNK, 1, INTERVAL_TO_INDEX, 2},
+        new Object[]{LockGranularity.SEGMENT, 10, INTERVAL_TO_INDEX, 2},
+        new Object[]{LockGranularity.TIME_CHUNK, 10, INTERVAL_TO_INDEX, null},
+        new Object[]{LockGranularity.TIME_CHUNK, 10, null, null},
+        new Object[]{LockGranularity.TIME_CHUNK, 1, INTERVAL_TO_INDEX, null},
+        new Object[]{LockGranularity.SEGMENT, 10, INTERVAL_TO_INDEX, null}
     );
   }
 
@@ -120,13 +109,12 @@ public static Iterable<Object[]> constructorFeeder()
 
   public HashPartitionMultiPhaseParallelIndexingTest(
       LockGranularity lockGranularity,
-      boolean useInputFormatApi,
       int maxNumConcurrentSubTasks,
       @Nullable Interval intervalToIndex,
       @Nullable Integer numShards
   )
   {
-    super(lockGranularity, useInputFormatApi, DEFAULT_TRANSIENT_TASK_FAILURE_RATE, DEFAULT_TRANSIENT_API_FAILURE_RATE);
+    super(lockGranularity, DEFAULT_TRANSIENT_TASK_FAILURE_RATE, DEFAULT_TRANSIENT_API_FAILURE_RATE);
     this.maxNumConcurrentSubTasks = maxNumConcurrentSubTasks;
     this.intervalToIndex = intervalToIndex;
     this.numShards = numShards;
@@ -336,35 +324,18 @@ private ParallelIndexSupervisorTask createTask(
       boolean dropExisting
   )
   {
-    if (isUseInputFormatApi()) {
-      return createTask(
-          TIMESTAMP_SPEC,
-          DIMENSIONS_SPEC,
-          INPUT_FORMAT,
-          null,
-          intervalToIndex,
-          inputDirectory,
-          INPUT_FILTER,
-          partitionsSpec,
-          maxNumConcurrentSubTasks,
-          appendToExisting,
-          dropExisting
-      );
-    } else {
-      return createTask(
-          null,
-          null,
-          null,
-          PARSE_SPEC,
-          intervalToIndex,
-          inputDirectory,
-          INPUT_FILTER,
-          partitionsSpec,
-          maxNumConcurrentSubTasks,
-          appendToExisting,
-          dropExisting
-      );
-    }
+    return createTask(
+        TIMESTAMP_SPEC,
+        DIMENSIONS_SPEC,
+        INPUT_FORMAT,
+        intervalToIndex,
+        inputDirectory,
+        INPUT_FILTER,
+        partitionsSpec,
+        maxNumConcurrentSubTasks,
+        appendToExisting,
+        dropExisting
+    );
   }
 
   private void assertHashedPartition(
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionTaskKillTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionTaskKillTest.java
index 9712ca602936..ac361e0efa63 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionTaskKillTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionTaskKillTest.java
@@ -19,13 +19,11 @@
 
 package org.apache.druid.indexing.common.task.batch.parallel;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import org.apache.druid.data.input.InputFormat;
 import org.apache.druid.data.input.impl.CsvInputFormat;
 import org.apache.druid.data.input.impl.DimensionsSpec;
 import org.apache.druid.data.input.impl.LocalInputSource;
-import org.apache.druid.data.input.impl.ParseSpec;
 import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.indexer.TaskState;
 import org.apache.druid.indexer.TaskStatus;
@@ -89,7 +87,7 @@ public class HashPartitionTaskKillTest extends AbstractMultiPhaseParallelIndexin
 
   public HashPartitionTaskKillTest()
   {
-    super(LockGranularity.TIME_CHUNK, true, 0, 0);
+    super(LockGranularity.TIME_CHUNK, 0, 0);
   }
 
   @Before
@@ -125,12 +123,12 @@ public void setup() throws IOException
   public void failsInFirstPhase() throws Exception
   {
     final ParallelIndexSupervisorTask task =
-        createTestTask(TIMESTAMP_SPEC, DIMENSIONS_SPEC, INPUT_FORMAT, null, INTERVAL_TO_INDEX, inputDir,
+        createTestTask(TIMESTAMP_SPEC, DIMENSIONS_SPEC, INPUT_FORMAT, INTERVAL_TO_INDEX, inputDir,
                 "test_*",
                 new HashedPartitionsSpec(null, null, // num shards is null to force it to go to first phase
                                          ImmutableList.of("dim1", "dim2")
                 ),
-                2, false, true, 0
+                2, false, 0
         );
 
     final TaskActionClient actionClient = createActionClient(task);
@@ -153,12 +151,12 @@ public void failsInFirstPhase() throws Exception
   public void failsInSecondPhase() throws Exception
   {
     final ParallelIndexSupervisorTask task =
-        createTestTask(TIMESTAMP_SPEC, DIMENSIONS_SPEC, INPUT_FORMAT, null, INTERVAL_TO_INDEX, inputDir,
+        createTestTask(TIMESTAMP_SPEC, DIMENSIONS_SPEC, INPUT_FORMAT, INTERVAL_TO_INDEX, inputDir,
                 "test_*",
                 new HashedPartitionsSpec(null, 3,
                                          ImmutableList.of("dim1", "dim2")
                 ),
-                2, false, true, 0
+                2, false, 0
         );
 
     final TaskActionClient actionClient = createActionClient(task);
@@ -182,7 +180,6 @@ public void failsInThirdPhase() throws Exception
   {
     final ParallelIndexSupervisorTask task =
         createTestTask(TIMESTAMP_SPEC, DIMENSIONS_SPEC, INPUT_FORMAT,
-                null,
                 INTERVAL_TO_INDEX,
                 inputDir,
                 "test_*",
@@ -191,7 +188,6 @@ public void failsInThirdPhase() throws Exception
                 ),
                 2,
                 false,
-                true,
                 1
         );
 
@@ -216,14 +212,12 @@ private ParallelIndexSupervisorTask createTestTask(
       @Nullable TimestampSpec timestampSpec,
       @Nullable DimensionsSpec dimensionsSpec,
       @Nullable InputFormat inputFormat,
-      @Nullable ParseSpec parseSpec,
       Interval interval,
       File inputDir,
       String filter,
       PartitionsSpec partitionsSpec,
       int maxNumConcurrentSubTasks,
       boolean appendToExisting,
-      boolean useInputFormatApi,
       int succeedsBeforeFailing
   )
   {
@@ -239,48 +233,23 @@ private ParallelIndexSupervisorTask createTestTask(
         !appendToExisting
     );
 
-    final ParallelIndexIngestionSpec ingestionSpec;
-
-    if (useInputFormatApi) {
-      Preconditions.checkArgument(parseSpec == null);
-      ParallelIndexIOConfig ioConfig = new ParallelIndexIOConfig(
-          new LocalInputSource(inputDir, filter),
-          inputFormat,
-          appendToExisting,
-          null
-      );
-      ingestionSpec = new ParallelIndexIngestionSpec(
-          DataSchema.builder()
-                    .withDataSource(DATASOURCE)
-                    .withTimestamp(timestampSpec)
-                    .withDimensions(dimensionsSpec)
-                    .withAggregators(new LongSumAggregatorFactory("val", "val"))
-                    .withGranularity(granularitySpec)
-                    .build(),
-          ioConfig,
-          tuningConfig
-      );
-    } else {
-      Preconditions.checkArgument(inputFormat == null);
-      ParallelIndexIOConfig ioConfig = new ParallelIndexIOConfig(
-          new LocalInputSource(inputDir, filter),
-          createInputFormatFromParseSpec(parseSpec),
-          appendToExisting,
-          null
-      );
-      //noinspection unchecked
-      ingestionSpec = new ParallelIndexIngestionSpec(
-          DataSchema.builder()
-                    .withDataSource("dataSource")
-                    .withTimestamp(parseSpec.getTimestampSpec())
-                    .withDimensions(parseSpec.getDimensionsSpec())
-                    .withAggregators(new LongSumAggregatorFactory("val", "val"))
-                    .withGranularity(granularitySpec)
-                    .build(),
-          ioConfig,
-          tuningConfig
-      );
-    }
+    ParallelIndexIOConfig ioConfig = new ParallelIndexIOConfig(
+        new LocalInputSource(inputDir, filter),
+        inputFormat,
+        appendToExisting,
+        null
+    );
+    ParallelIndexIngestionSpec ingestionSpec = new ParallelIndexIngestionSpec(
+        DataSchema.builder()
+                  .withDataSource(DATASOURCE)
+                  .withTimestamp(timestampSpec)
+                  .withDimensions(dimensionsSpec)
+                  .withAggregators(new LongSumAggregatorFactory("val", "val"))
+                  .withGranularity(granularitySpec)
+                  .build(),
+        ioConfig,
+        tuningConfig
+    );
 
     return new ParallelIndexSupervisorTaskTest(
         null,
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingRowStatsTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingRowStatsTest.java
index 9e910a668157..afba6d17cc3a 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingRowStatsTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingRowStatsTest.java
@@ -20,9 +20,9 @@
 package org.apache.druid.indexing.common.task.batch.parallel;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.druid.data.input.impl.CSVParseSpec;
+import org.apache.druid.data.input.InputFormat;
+import org.apache.druid.data.input.impl.CsvInputFormat;
 import org.apache.druid.data.input.impl.DimensionsSpec;
-import org.apache.druid.data.input.impl.ParseSpec;
 import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.indexer.TaskState;
 import org.apache.druid.indexer.partitions.HashedPartitionsSpec;
@@ -55,13 +55,13 @@ public class MultiPhaseParallelIndexingRowStatsTest extends AbstractMultiPhasePa
   private static final DimensionsSpec DIMENSIONS_SPEC = new DimensionsSpec(
       DimensionsSpec.getDefaultSchemas(Arrays.asList(TIME, DIM1, DIM2))
   );
-  private static final ParseSpec PARSE_SPEC = new CSVParseSpec(
-      TIMESTAMP_SPEC,
-      DIMENSIONS_SPEC,
-      null,
+  private static final InputFormat INPUT_FORMAT = new CsvInputFormat(
       Arrays.asList("ts", "dim1", "dim2", "val"),
+      null,
       false,
-      0
+      false,
+      0,
+      null
   );
 
   private static final Interval INTERVAL_TO_INDEX = Intervals.of("2017-12/P1M");
@@ -72,7 +72,6 @@ public MultiPhaseParallelIndexingRowStatsTest()
   {
     super(
         LockGranularity.SEGMENT,
-        false,
         DEFAULT_TRANSIENT_TASK_FAILURE_RATE,
         DEFAULT_TRANSIENT_API_FAILURE_RATE
     );
@@ -120,10 +119,9 @@ private void testHashPartitionRowStats(int maxNumConcurrentSubTasks)
     final Integer numShards = 10;
 
     ParallelIndexSupervisorTask task = createTask(
-        null,
-        null,
-        null,
-        PARSE_SPEC,
+        TIMESTAMP_SPEC,
+        DIMENSIONS_SPEC,
+        INPUT_FORMAT,
         INTERVAL_TO_INDEX,
         inputDir,
         "test_*",
@@ -157,10 +155,9 @@ public void testRangePartitionRowStats()
   {
     final int targetRowsPerSegment = 20;
     ParallelIndexSupervisorTask task = createTask(
-        null,
-        null,
-        null,
-        PARSE_SPEC,
+        TIMESTAMP_SPEC,
+        DIMENSIONS_SPEC,
+        INPUT_FORMAT,
         INTERVAL_TO_INDEX,
         inputDir,
         "test_*",
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingWithNullColumnTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingWithNullColumnTest.java
index 4f621e17712d..f893de6fd186 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingWithNullColumnTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingWithNullColumnTest.java
@@ -111,7 +111,7 @@ public static Iterable<Object[]> constructorFeeder()
 
   public MultiPhaseParallelIndexingWithNullColumnTest(PartitionsSpec partitionsSpec)
   {
-    super(LockGranularity.TIME_CHUNK, true, 0., 0.);
+    super(LockGranularity.TIME_CHUNK, 0., 0.);
     this.partitionsSpec = partitionsSpec;
     getObjectMapper().registerSubtypes(SplittableInlineDataSource.class);
   }
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialCompactionTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialCompactionTest.java
index 882c1c73bb1b..a0561f846270 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialCompactionTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialCompactionTest.java
@@ -77,7 +77,7 @@ public class PartialCompactionTest extends AbstractMultiPhaseParallelIndexingTes
 
   public PartialCompactionTest()
   {
-    super(LockGranularity.TIME_CHUNK, true, DEFAULT_TRANSIENT_TASK_FAILURE_RATE, DEFAULT_TRANSIENT_API_FAILURE_RATE);
+    super(LockGranularity.TIME_CHUNK, DEFAULT_TRANSIENT_TASK_FAILURE_RATE, DEFAULT_TRANSIENT_API_FAILURE_RATE);
   }
 
   @Before
@@ -371,7 +371,6 @@ private DataSegmentsWithSchemas runTestTask(
         TIMESTAMP_SPEC,
         DIMENSIONS_SPEC,
         INPUT_FORMAT,
-        null,
         INTERVAL_TO_INDEX,
         inputDir,
         "test_*",
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionAdjustingCorePartitionSizeTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionAdjustingCorePartitionSizeTest.java
index efa8991b206a..ad2c674d55d5 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionAdjustingCorePartitionSizeTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionAdjustingCorePartitionSizeTest.java
@@ -80,7 +80,7 @@ public static Iterable<Object[]> constructorFeeder()
 
   public RangePartitionAdjustingCorePartitionSizeTest(LockGranularity lockGranularity, int maxNumConcurrentSubTasks)
   {
-    super(lockGranularity, true, DEFAULT_TRANSIENT_TASK_FAILURE_RATE, DEFAULT_TRANSIENT_API_FAILURE_RATE);
+    super(lockGranularity, DEFAULT_TRANSIENT_TASK_FAILURE_RATE, DEFAULT_TRANSIENT_API_FAILURE_RATE);
     this.maxNumConcurrentSubTasks = maxNumConcurrentSubTasks;
   }
 
@@ -112,7 +112,6 @@ public void testLessPartitionsThanBuckets() throws IOException
             TIMESTAMP_SPEC,
             DIMENSIONS_SPEC,
             INPUT_FORMAT,
-            null,
             INTERVAL_TO_INDEX,
             inputDir,
             "test_*",
@@ -152,7 +151,6 @@ public void testEqualNumberOfPartitionsToBuckets() throws IOException
         TIMESTAMP_SPEC,
         DIMENSIONS_SPEC,
         INPUT_FORMAT,
-        null,
         INTERVAL_TO_INDEX,
         inputDir,
         "test_*",
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionMultiPhaseParallelIndexingTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionMultiPhaseParallelIndexingTest.java
index 38cb488669bb..cc3abacba0a7 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionMultiPhaseParallelIndexingTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionMultiPhaseParallelIndexingTest.java
@@ -26,10 +26,8 @@
 import com.google.common.collect.SetMultimap;
 import org.apache.druid.data.input.InputFormat;
 import org.apache.druid.data.input.StringTuple;
-import org.apache.druid.data.input.impl.CSVParseSpec;
 import org.apache.druid.data.input.impl.CsvInputFormat;
 import org.apache.druid.data.input.impl.DimensionsSpec;
-import org.apache.druid.data.input.impl.ParseSpec;
 import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.indexer.TaskState;
 import org.apache.druid.indexer.partitions.DimensionRangePartitionsSpec;
@@ -76,7 +74,6 @@
 @RunWith(Parameterized.class)
 public class RangePartitionMultiPhaseParallelIndexingTest extends AbstractMultiPhaseParallelIndexingTest
 {
-  private static final boolean USE_INPUT_FORMAT_API = true;
   private static final boolean USE_MULTIVALUE_DIM = true;
   private static final int NUM_FILE = 10;
   private static final int NUM_ROW = 20;
@@ -94,14 +91,6 @@ public class RangePartitionMultiPhaseParallelIndexingTest extends AbstractMultiP
   private static final DimensionsSpec DIMENSIONS_SPEC = new DimensionsSpec(
       DimensionsSpec.getDefaultSchemas(Arrays.asList(TIME, DIM1, DIM2))
   );
-  private static final ParseSpec PARSE_SPEC = new CSVParseSpec(
-      TIMESTAMP_SPEC,
-      DIMENSIONS_SPEC,
-      LIST_DELIMITER,
-      Arrays.asList(TIME, DIM1, DIM2, "val"),
-      false,
-      0
-  );
   private static final InputFormat INPUT_FORMAT = new CsvInputFormat(
       Arrays.asList(TIME, DIM1, DIM2, "val"),
       LIST_DELIMITER,
@@ -111,16 +100,15 @@ public class RangePartitionMultiPhaseParallelIndexingTest extends AbstractMultiP
       null
   );
 
-  @Parameterized.Parameters(name = "{0}, useInputFormatApi={1}, maxNumConcurrentSubTasks={2}, useMultiValueDim={3}, intervalToIndex={4}")
+  @Parameterized.Parameters(name = "{0}, maxNumConcurrentSubTasks={1}, useMultiValueDim={2}, intervalToIndex={3}")
   public static Iterable<Object[]> constructorFeeder()
   {
     return ImmutableList.of(
-        new Object[]{LockGranularity.TIME_CHUNK, !USE_INPUT_FORMAT_API, 10, !USE_MULTIVALUE_DIM, INTERVAL_TO_INDEX},
-        new Object[]{LockGranularity.TIME_CHUNK, USE_INPUT_FORMAT_API, 10, !USE_MULTIVALUE_DIM, INTERVAL_TO_INDEX},
-        new Object[]{LockGranularity.TIME_CHUNK, USE_INPUT_FORMAT_API, 10, !USE_MULTIVALUE_DIM, null},
-        new Object[]{LockGranularity.SEGMENT, USE_INPUT_FORMAT_API, 10, !USE_MULTIVALUE_DIM, INTERVAL_TO_INDEX},
-        new Object[]{LockGranularity.SEGMENT, USE_INPUT_FORMAT_API, 1, !USE_MULTIVALUE_DIM, INTERVAL_TO_INDEX},  // will spawn subtask
-        new Object[]{LockGranularity.SEGMENT, USE_INPUT_FORMAT_API, 10, USE_MULTIVALUE_DIM, INTERVAL_TO_INDEX}  // expected to fail
+        new Object[]{LockGranularity.TIME_CHUNK, 10, !USE_MULTIVALUE_DIM, INTERVAL_TO_INDEX},
+        new Object[]{LockGranularity.TIME_CHUNK, 10, !USE_MULTIVALUE_DIM, null},
+        new Object[]{LockGranularity.SEGMENT, 10, !USE_MULTIVALUE_DIM, INTERVAL_TO_INDEX},
+        new Object[]{LockGranularity.SEGMENT, 1, !USE_MULTIVALUE_DIM, INTERVAL_TO_INDEX},  // will spawn subtask
+        new Object[]{LockGranularity.SEGMENT, 10, USE_MULTIVALUE_DIM, INTERVAL_TO_INDEX}  // expected to fail
     );
   }
 
@@ -134,13 +122,12 @@ public static Iterable<Object[]> constructorFeeder()
 
   public RangePartitionMultiPhaseParallelIndexingTest(
       LockGranularity lockGranularity,
-      boolean useInputFormatApi,
       int maxNumConcurrentSubTasks,
       boolean useMultivalueDim,
       @Nullable Interval intervalToIndex
   )
   {
-    super(lockGranularity, useInputFormatApi, DEFAULT_TRANSIENT_TASK_FAILURE_RATE, DEFAULT_TRANSIENT_API_FAILURE_RATE);
+    super(lockGranularity, DEFAULT_TRANSIENT_TASK_FAILURE_RATE, DEFAULT_TRANSIENT_API_FAILURE_RATE);
     this.maxNumConcurrentSubTasks = maxNumConcurrentSubTasks;
     this.useMultivalueDim = useMultivalueDim;
     this.intervalToIndex = intervalToIndex;
@@ -400,35 +387,18 @@ private ParallelIndexSupervisorTask runTestTask(
       boolean dropExisting
   )
   {
-    if (isUseInputFormatApi()) {
-      return createTask(
-          TIMESTAMP_SPEC,
-          DIMENSIONS_SPEC,
-          INPUT_FORMAT,
-          null,
-          intervalToIndex,
-          inputDirectory,
-          TEST_FILE_NAME_PREFIX + "*",
-          partitionsSpec,
-          maxNumConcurrentSubTasks,
-          appendToExisting,
-          dropExisting
-      );
-    } else {
-      return createTask(
-          null,
-          null,
-          null,
-          PARSE_SPEC,
-          intervalToIndex,
-          inputDirectory,
-          TEST_FILE_NAME_PREFIX + "*",
-          partitionsSpec,
-          maxNumConcurrentSubTasks,
-          appendToExisting,
-          dropExisting
-      );
-    }
+    return createTask(
+        TIMESTAMP_SPEC,
+        DIMENSIONS_SPEC,
+        INPUT_FORMAT,
+        intervalToIndex,
+        inputDirectory,
+        TEST_FILE_NAME_PREFIX + "*",
+        partitionsSpec,
+        maxNumConcurrentSubTasks,
+        appendToExisting,
+        dropExisting
+    );
   }
 
   private void assertRangePartitions(Set<DataSegment> publishedSegments) throws IOException
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionTaskKillTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionTaskKillTest.java
index 13155d9d3f40..6eefd9ba1033 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionTaskKillTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionTaskKillTest.java
@@ -19,13 +19,11 @@
 
 package org.apache.druid.indexing.common.task.batch.parallel;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import org.apache.druid.data.input.InputFormat;
 import org.apache.druid.data.input.impl.CsvInputFormat;
 import org.apache.druid.data.input.impl.DimensionsSpec;
 import org.apache.druid.data.input.impl.LocalInputSource;
-import org.apache.druid.data.input.impl.ParseSpec;
 import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.indexer.TaskState;
 import org.apache.druid.indexer.TaskStatus;
@@ -92,7 +90,7 @@ public class RangePartitionTaskKillTest extends AbstractMultiPhaseParallelIndexi
 
   public RangePartitionTaskKillTest()
   {
-    super(LockGranularity.SEGMENT, true, DEFAULT_TRANSIENT_TASK_FAILURE_RATE, DEFAULT_TRANSIENT_API_FAILURE_RATE);
+    super(LockGranularity.SEGMENT, DEFAULT_TRANSIENT_TASK_FAILURE_RATE, DEFAULT_TRANSIENT_API_FAILURE_RATE);
   }
 
   @Before
@@ -109,7 +107,6 @@ public void failsFirstPhase() throws Exception
         newTask(TIMESTAMP_SPEC,
                 DIMENSIONS_SPEC,
                 INPUT_FORMAT,
-                null,
                 INTERVAL_TO_INDEX,
                 inputDir,
                 TEST_FILE_NAME_PREFIX + "*",
@@ -149,7 +146,6 @@ public void failsSecondPhase() throws Exception
         newTask(TIMESTAMP_SPEC,
                 DIMENSIONS_SPEC,
                 INPUT_FORMAT,
-                null,
                 INTERVAL_TO_INDEX,
                 inputDir,
                 TEST_FILE_NAME_PREFIX + "*",
@@ -189,7 +185,6 @@ public void failsThirdPhase() throws Exception
         newTask(TIMESTAMP_SPEC,
                 DIMENSIONS_SPEC,
                 INPUT_FORMAT,
-                null,
                 INTERVAL_TO_INDEX,
                 inputDir,
                 TEST_FILE_NAME_PREFIX + "*",
@@ -297,7 +292,6 @@ protected ParallelIndexSupervisorTask newTask(
       @Nullable TimestampSpec timestampSpec,
       @Nullable DimensionsSpec dimensionsSpec,
       @Nullable InputFormat inputFormat,
-      @Nullable ParseSpec parseSpec,
       Interval interval,
       File inputDir,
       String filter,
@@ -319,16 +313,13 @@ protected ParallelIndexSupervisorTask newTask(
         !appendToExisting
     );
 
-    final ParallelIndexIngestionSpec ingestionSpec;
-
-    Preconditions.checkArgument(parseSpec == null);
     ParallelIndexIOConfig ioConfig = new ParallelIndexIOConfig(
         new LocalInputSource(inputDir, filter),
         inputFormat,
         appendToExisting,
         null
     );
-    ingestionSpec = new ParallelIndexIngestionSpec(
+    ParallelIndexIngestionSpec ingestionSpec = new ParallelIndexIngestionSpec(
         DataSchema.builder()
                   .withDataSource(DATASOURCE)
                   .withTimestamp(timestampSpec)
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingTest.java
index a0e3f3245f2c..77232de51469 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingTest.java
@@ -996,7 +996,7 @@ private ParallelIndexSupervisorTask newTask(
                     .build(),
           new ParallelIndexIOConfig(
               new LocalInputSource(inputDir, inputSourceFilter),
-              createInputFormatFromParseSpec(DEFAULT_PARSE_SPEC),
+              DEFAULT_INPUT_FORMAT,
               appendToExisting,
               null
           ),
diff --git a/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQCompactionTaskRunTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQCompactionTaskRunTest.java
index 5ecb55192359..787b980307f4 100644
--- a/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQCompactionTaskRunTest.java
+++ b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQCompactionTaskRunTest.java
@@ -492,7 +492,9 @@ public void testMSQCompactionWithConcurrentAppendCompactionLocksFirst() throws E
     rows.add("2014-01-01T02:00:30Z,b1,12\n");
     rows.add("2014-01-01T02:00:30Z,c1,13\n");
     final IndexTask appendTask = buildIndexTask(
-        DEFAULT_PARSE_SPEC,
+        DEFAULT_TIMESTAMP_SPEC,
+        DEFAULT_DIMENSIONS_SPEC,
+        DEFAULT_INPUT_FORMAT,
         rows,
         Intervals.of("2014-01-01T00:00:00Z/2014-01-01T03:00:00Z"),
         true
@@ -554,7 +556,9 @@ public void testMSQCompactionWithConcurrentAppendAppendLocksFirst() throws Excep
     rows.add("2014-01-01T02:00:30Z,b1,12\n");
     rows.add("2014-01-01T02:00:30Z,c1,13\n");
     final IndexTask appendTask = buildIndexTask(
-        DEFAULT_PARSE_SPEC,
+        DEFAULT_TIMESTAMP_SPEC,
+        DEFAULT_DIMENSIONS_SPEC,
+        DEFAULT_INPUT_FORMAT,
         rows,
         Intervals.of("2014-01-01T00:00:00Z/2014-01-01T03:00:00Z"),
         true
@@ -655,7 +659,7 @@ public void testMinorCompactionRangePartition() throws Exception
     Assume.assumeTrue(lockGranularity == LockGranularity.TIME_CHUNK);
     Assume.assumeTrue("Minor compaction depends on concurrent lock", useConcurrentLocks);
     verifyTaskSuccessRowsAndSchemaMatch(
-        runTask(buildIndexTask(DEFAULT_PARSE_SPEC, rows, inputInterval, false)),
+        runTask(buildIndexTask(DEFAULT_TIMESTAMP_SPEC, DEFAULT_DIMENSIONS_SPEC, DEFAULT_INPUT_FORMAT, rows, inputInterval, false)),
         9
     );
 
@@ -673,7 +677,7 @@ public void testMinorCompactionRangePartition() throws Exception
     Assert.assertEquals(3, resultPair1.rhs.getSegments().size());
 
     Pair<TaskStatus, DataSegmentsWithSchemas> appendTask =
-        runTask(buildIndexTask(DEFAULT_PARSE_SPEC, rows, inputInterval, true));
+        runTask(buildIndexTask(DEFAULT_TIMESTAMP_SPEC, DEFAULT_DIMENSIONS_SPEC, DEFAULT_INPUT_FORMAT, rows, inputInterval, true));
     verifyTaskSuccessRowsAndSchemaMatch(appendTask, 9);
 
     List<SegmentDescriptor> uncompacted = appendTask.rhs.getSegments()
@@ -715,7 +719,9 @@ public void testMinorCompactionOverlappingInterval() throws Exception
     rows.add("2014-01-01T10:00:20Z,c1,13\n");
     final IndexTask indexTask = buildIndexTask(
         Granularities.SIX_HOUR,
-        DEFAULT_PARSE_SPEC,
+        DEFAULT_TIMESTAMP_SPEC,
+        DEFAULT_DIMENSIONS_SPEC,
+        DEFAULT_INPUT_FORMAT,
         rows,
         TEST_INTERVAL_DAY,
         true
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/CSVParseSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/CSVParseSpec.java
deleted file mode 100644
index 2a5adfe0a4b1..000000000000
--- a/processing/src/main/java/org/apache/druid/data/input/impl/CSVParseSpec.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Preconditions;
-import org.apache.druid.java.util.common.parsers.CSVParser;
-import org.apache.druid.java.util.common.parsers.Parser;
-
-import java.util.List;
-
-/**
- */
-public class CSVParseSpec extends ParseSpec
-{
-  private final String listDelimiter;
-  private final List<String> columns;
-  private final boolean hasHeaderRow;
-  private final int skipHeaderRows;
-
-  @JsonCreator
-  public CSVParseSpec(
-      @JsonProperty("timestampSpec") TimestampSpec timestampSpec,
-      @JsonProperty("dimensionsSpec") DimensionsSpec dimensionsSpec,
-      @JsonProperty("listDelimiter") String listDelimiter,
-      @JsonProperty("columns") List<String> columns,
-      @JsonProperty("hasHeaderRow") boolean hasHeaderRow,
-      @JsonProperty("skipHeaderRows") int skipHeaderRows
-  )
-  {
-    super(timestampSpec, dimensionsSpec);
-
-    this.listDelimiter = listDelimiter;
-    this.columns = columns;
-    this.hasHeaderRow = hasHeaderRow;
-    this.skipHeaderRows = skipHeaderRows;
-
-    if (columns != null) {
-      for (String column : columns) {
-        Preconditions.checkArgument(!column.contains(","), "Column[%s] has a comma, it cannot", column);
-      }
-    } else {
-      Preconditions.checkArgument(
-          hasHeaderRow,
-          "If columns field is not set, the first row of your data must have your header"
-          + " and hasHeaderRow must be set to true."
-      );
-    }
-  }
-
-  @JsonProperty
-  public String getListDelimiter()
-  {
-    return listDelimiter;
-  }
-
-  @JsonProperty("columns")
-  public List<String> getColumns()
-  {
-    return columns;
-  }
-
-  @JsonProperty
-  public boolean isHasHeaderRow()
-  {
-    return hasHeaderRow;
-  }
-
-  @JsonProperty("skipHeaderRows")
-  public int getSkipHeaderRows()
-  {
-    return skipHeaderRows;
-  }
-
-  @Override
-  public Parser<String, Object> makeParser()
-  {
-    return new CSVParser(listDelimiter, columns, hasHeaderRow, skipHeaderRows, false);
-  }
-
-  @Override
-  public ParseSpec withTimestampSpec(TimestampSpec spec)
-  {
-    return new CSVParseSpec(spec, getDimensionsSpec(), listDelimiter, columns, hasHeaderRow, skipHeaderRows);
-  }
-
-  @Override
-  public ParseSpec withDimensionsSpec(DimensionsSpec spec)
-  {
-    return new CSVParseSpec(getTimestampSpec(), spec, listDelimiter, columns, hasHeaderRow, skipHeaderRows);
-  }
-}
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/DelimitedParseSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/DelimitedParseSpec.java
deleted file mode 100644
index 3327989e9f5e..000000000000
--- a/processing/src/main/java/org/apache/druid/data/input/impl/DelimitedParseSpec.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Preconditions;
-import org.apache.druid.java.util.common.parsers.DelimitedParser;
-import org.apache.druid.java.util.common.parsers.Parser;
-
-import java.util.List;
-
-/**
- */
-public class DelimitedParseSpec extends ParseSpec
-{
-  private final String delimiter;
-  private final String listDelimiter;
-  private final List<String> columns;
-  private final boolean hasHeaderRow;
-  private final int skipHeaderRows;
-
-  @JsonCreator
-  public DelimitedParseSpec(
-      @JsonProperty("timestampSpec") TimestampSpec timestampSpec,
-      @JsonProperty("dimensionsSpec") DimensionsSpec dimensionsSpec,
-      @JsonProperty("delimiter") String delimiter,
-      @JsonProperty("listDelimiter") String listDelimiter,
-      @JsonProperty("columns") List<String> columns,
-      @JsonProperty("hasHeaderRow") boolean hasHeaderRow,
-      @JsonProperty("skipHeaderRows") int skipHeaderRows
-  )
-  {
-    super(timestampSpec, dimensionsSpec);
-
-    this.delimiter = delimiter;
-    this.listDelimiter = listDelimiter;
-    this.columns = columns;
-    this.hasHeaderRow = hasHeaderRow;
-    this.skipHeaderRows = skipHeaderRows;
-
-    if (columns != null) {
-      for (String column : this.columns) {
-        Preconditions.checkArgument(!column.contains(","), "Column[%s] has a comma, it cannot", column);
-      }
-    } else {
-      Preconditions.checkArgument(
-          hasHeaderRow,
-          "If columns field is not set, the first row of your data must have your header"
-          + " and hasHeaderRow must be set to true."
-      );
-    }
-  }
-
-  @JsonProperty("delimiter")
-  public String getDelimiter()
-  {
-    return delimiter;
-  }
-
-  @JsonProperty("listDelimiter")
-  public String getListDelimiter()
-  {
-    return listDelimiter;
-  }
-
-  @JsonProperty("columns")
-  public List<String> getColumns()
-  {
-    return columns;
-  }
-
-  @JsonProperty
-  public boolean isHasHeaderRow()
-  {
-    return hasHeaderRow;
-  }
-
-  @JsonProperty("skipHeaderRows")
-  public int getSkipHeaderRows()
-  {
-    return skipHeaderRows;
-  }
-
-  @Override
-  public Parser<String, Object> makeParser()
-  {
-    return new DelimitedParser(
-        delimiter,
-        listDelimiter,
-        columns,
-        hasHeaderRow,
-        skipHeaderRows,
-        false
-    );
-  }
-
-  @Override
-  public ParseSpec withTimestampSpec(TimestampSpec spec)
-  {
-    return new DelimitedParseSpec(
-        spec,
-        getDimensionsSpec(),
-        delimiter,
-        listDelimiter,
-        columns,
-        hasHeaderRow,
-        skipHeaderRows
-    );
-  }
-
-  @Override
-  public ParseSpec withDimensionsSpec(DimensionsSpec spec)
-  {
-    return new DelimitedParseSpec(
-        getTimestampSpec(),
-        spec,
-        delimiter,
-        listDelimiter,
-        columns,
-        hasHeaderRow,
-        skipHeaderRows
-    );
-  }
-
-}
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpec.java
deleted file mode 100644
index 7422fccd1266..000000000000
--- a/processing/src/main/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpec.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.druid.java.util.common.parsers.JSONToLowerParser;
-import org.apache.druid.java.util.common.parsers.Parser;
-
-/**
- * This class is only here for backwards compatibility
- */
-@Deprecated
-public class JSONLowercaseParseSpec extends ParseSpec
-{
-  private final ObjectMapper objectMapper;
-
-  @JsonCreator
-  public JSONLowercaseParseSpec(
-      @JsonProperty("timestampSpec") TimestampSpec timestampSpec,
-      @JsonProperty("dimensionsSpec") DimensionsSpec dimensionsSpec
-  )
-  {
-    super(timestampSpec, dimensionsSpec);
-    this.objectMapper = new ObjectMapper();
-  }
-
-  @Override
-  public Parser<String, Object> makeParser()
-  {
-    return new JSONToLowerParser(objectMapper, null, null);
-  }
-
-  @Override
-  public ParseSpec withTimestampSpec(TimestampSpec spec)
-  {
-    return new JSONLowercaseParseSpec(spec, getDimensionsSpec());
-  }
-
-  @Override
-  public ParseSpec withDimensionsSpec(DimensionsSpec spec)
-  {
-    return new JSONLowercaseParseSpec(getTimestampSpec(), spec);
-  }
-}
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/JSONParseSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/JSONParseSpec.java
deleted file mode 100644
index 46820e176d1c..000000000000
--- a/processing/src/main/java/org/apache/druid/data/input/impl/JSONParseSpec.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.JsonParser.Feature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.druid.java.util.common.parsers.JSONPathParser;
-import org.apache.druid.java.util.common.parsers.JSONPathSpec;
-import org.apache.druid.java.util.common.parsers.Parser;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- */
-public class JSONParseSpec extends NestedDataParseSpec<JSONPathSpec>
-{
-  private final ObjectMapper objectMapper;
-  private final Map<String, Boolean> featureSpec;
-  private final boolean keepNullColumns;
-
-  @JsonCreator
-  public JSONParseSpec(
-      @JsonProperty("timestampSpec") TimestampSpec timestampSpec,
-      @JsonProperty("dimensionsSpec") DimensionsSpec dimensionsSpec,
-      @JsonProperty("flattenSpec") JSONPathSpec flattenSpec,
-      @JsonProperty("featureSpec") Map<String, Boolean> featureSpec,
-      @JsonProperty("keepNullColumns") Boolean keepNullColumns
-  )
-  {
-    super(timestampSpec, dimensionsSpec, flattenSpec != null ? flattenSpec : JSONPathSpec.DEFAULT);
-    this.objectMapper = new ObjectMapper();
-    this.keepNullColumns = (keepNullColumns == null) ? false : keepNullColumns;
-    this.featureSpec = (featureSpec == null) ? new HashMap<>() : featureSpec;
-    for (Map.Entry<String, Boolean> entry : this.featureSpec.entrySet()) {
-      Feature feature = Feature.valueOf(entry.getKey());
-      objectMapper.configure(feature, entry.getValue());
-    }
-  }
-
-  public JSONParseSpec(TimestampSpec ts, DimensionsSpec dims)
-  {
-    this(ts, dims, null, null, false);
-  }
-
-  @Override
-  public Parser<String, Object> makeParser()
-  {
-    return new JSONPathParser(getFlattenSpec(), objectMapper, getKeepNullColumns());
-  }
-
-  @Override
-  public ParseSpec withTimestampSpec(TimestampSpec spec)
-  {
-    return new JSONParseSpec(spec, getDimensionsSpec(), getFlattenSpec(), getFeatureSpec(), getKeepNullColumns());
-  }
-
-  @Override
-  public ParseSpec withDimensionsSpec(DimensionsSpec spec)
-  {
-    return new JSONParseSpec(getTimestampSpec(), spec, getFlattenSpec(), getFeatureSpec(), getKeepNullColumns());
-  }
-
-  @JsonProperty
-  public Map<String, Boolean> getFeatureSpec()
-  {
-    return featureSpec;
-  }
-
-  @JsonProperty
-  public boolean getKeepNullColumns()
-  {
-    return keepNullColumns;
-  }
-
-  @Override
-  public boolean equals(final Object o)
-  {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    if (!super.equals(o)) {
-      return false;
-    }
-    final JSONParseSpec that = (JSONParseSpec) o;
-    return Objects.equals(featureSpec, that.featureSpec) && Objects.equals(keepNullColumns, that.keepNullColumns);
-  }
-
-  @Override
-  public int hashCode()
-  {
-    return Objects.hash(super.hashCode(), featureSpec, getKeepNullColumns());
-  }
-
-  @Override
-  public String toString()
-  {
-    return "JSONParseSpec{" +
-           "timestampSpec=" + getTimestampSpec() +
-           ", dimensionsSpec=" + getDimensionsSpec() +
-           ", flattenSpec=" + getFlattenSpec() +
-           ", featureSpec=" + featureSpec +
-           ", keepNullColumns=" + keepNullColumns +
-           '}';
-  }
-}
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/JavaScriptParseSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/JavaScriptParseSpec.java
deleted file mode 100644
index fe6d80e5c678..000000000000
--- a/processing/src/main/java/org/apache/druid/data/input/impl/JavaScriptParseSpec.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.annotation.JacksonInject;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Preconditions;
-import org.apache.druid.java.util.common.parsers.JavaScriptParser;
-import org.apache.druid.java.util.common.parsers.Parser;
-import org.apache.druid.js.JavaScriptConfig;
-
-/**
- */
-public class JavaScriptParseSpec extends ParseSpec
-{
-  private final String function;
-  private final JavaScriptConfig config;
-
-  // This variable is lazily initialized to avoid unnecessary JavaScript compilation during JSON serde
-  private JavaScriptParser parser;
-
-  @JsonCreator
-  public JavaScriptParseSpec(
-      @JsonProperty("timestampSpec") TimestampSpec timestampSpec,
-      @JsonProperty("dimensionsSpec") DimensionsSpec dimensionsSpec,
-      @JsonProperty("function") String function,
-      @JacksonInject JavaScriptConfig config
-  )
-  {
-    super(timestampSpec, dimensionsSpec);
-
-    this.function = function;
-    this.config = config;
-  }
-
-  @JsonProperty("function")
-  public String getFunction()
-  {
-    return function;
-  }
-
-  @Override
-  public Parser<String, Object> makeParser()
-  {
-    // JavaScript configuration should be checked when it's actually used because someone might still want Druid
-    // nodes to be able to deserialize JavaScript-based objects even though JavaScript is disabled.
-    Preconditions.checkState(config.isEnabled(), "JavaScript is disabled");
-    parser = parser == null ? new JavaScriptParser(function) : parser;
-    return parser;
-  }
-
-  @Override
-  public ParseSpec withTimestampSpec(TimestampSpec spec)
-  {
-    return new JavaScriptParseSpec(spec, getDimensionsSpec(), function, config);
-  }
-
-  @Override
-  public ParseSpec withDimensionsSpec(DimensionsSpec spec)
-  {
-    return new JavaScriptParseSpec(getTimestampSpec(), spec, function, config);
-  }
-
-}
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/NestedDataParseSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/NestedDataParseSpec.java
deleted file mode 100644
index f8d89ee980ef..000000000000
--- a/processing/src/main/java/org/apache/druid/data/input/impl/NestedDataParseSpec.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Objects;
-
-public abstract class NestedDataParseSpec<TFlattenSpec> extends ParseSpec
-{
-  private final TFlattenSpec flattenSpec;
-
-  protected NestedDataParseSpec(
-      @JsonProperty("timestampSpec") TimestampSpec timestampSpec,
-      @JsonProperty("dimensionsSpec") DimensionsSpec dimensionsSpec,
-      @JsonProperty("flattenSpec") TFlattenSpec flattenSpec
-  )
-  {
-    super(timestampSpec, dimensionsSpec);
-    this.flattenSpec = flattenSpec;
-  }
-
-  @JsonProperty
-  public TFlattenSpec getFlattenSpec()
-  {
-    return flattenSpec;
-  }
-
-  @Override
-  public boolean equals(Object o)
-  {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    if (!super.equals(o)) {
-      return false;
-    }
-    NestedDataParseSpec that = (NestedDataParseSpec) o;
-    return Objects.equals(flattenSpec, that.flattenSpec);
-  }
-
-  @Override
-  public int hashCode()
-  {
-    return Objects.hash(super.hashCode(), flattenSpec);
-  }
-}
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/ParseSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/ParseSpec.java
deleted file mode 100644
index 33e9f44644d9..000000000000
--- a/processing/src/main/java/org/apache/druid/data/input/impl/ParseSpec.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.google.common.base.Preconditions;
-import org.apache.druid.guice.annotations.ExtensionPoint;
-import org.apache.druid.guice.annotations.PublicApi;
-import org.apache.druid.java.util.common.parsers.Parser;
-
-@Deprecated
-@ExtensionPoint
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "format")
-@JsonSubTypes(value = {
-    @JsonSubTypes.Type(name = "json", value = JSONParseSpec.class),
-    @JsonSubTypes.Type(name = "csv", value = CSVParseSpec.class),
-    @JsonSubTypes.Type(name = "tsv", value = DelimitedParseSpec.class),
-    @JsonSubTypes.Type(name = "jsonLowercase", value = JSONLowercaseParseSpec.class),
-    @JsonSubTypes.Type(name = "timeAndDims", value = TimeAndDimsParseSpec.class),
-    @JsonSubTypes.Type(name = "regex", value = RegexParseSpec.class),
-    @JsonSubTypes.Type(name = "javascript", value = JavaScriptParseSpec.class)
-
-})
-public abstract class ParseSpec
-{
-  private final TimestampSpec timestampSpec;
-  private final DimensionsSpec dimensionsSpec;
-
-  protected ParseSpec(TimestampSpec timestampSpec, DimensionsSpec dimensionsSpec)
-  {
-    this.timestampSpec = Preconditions.checkNotNull(timestampSpec, "parseSpec requires timestampSpec");
-    this.dimensionsSpec = Preconditions.checkNotNull(dimensionsSpec, "parseSpec requires dimensionSpec");
-  }
-
-  @JsonProperty
-  public TimestampSpec getTimestampSpec()
-  {
-    return timestampSpec;
-  }
-
-  @JsonProperty
-  public DimensionsSpec getDimensionsSpec()
-  {
-    return dimensionsSpec;
-  }
-
-  public Parser<String, Object> makeParser()
-  {
-    return null;
-  }
-
-  @PublicApi
-  public ParseSpec withTimestampSpec(TimestampSpec spec)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public ParseSpec withDimensionsSpec(DimensionsSpec spec)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean equals(Object o)
-  {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-
-    ParseSpec parseSpec = (ParseSpec) o;
-
-    if (timestampSpec != null ? !timestampSpec.equals(parseSpec.timestampSpec) : parseSpec.timestampSpec != null) {
-      return false;
-    }
-    return !(dimensionsSpec != null
-             ? !dimensionsSpec.equals(parseSpec.dimensionsSpec)
-             : parseSpec.dimensionsSpec != null);
-
-  }
-
-  @Override
-  public int hashCode()
-  {
-    int result = timestampSpec != null ? timestampSpec.hashCode() : 0;
-    result = 31 * result + (dimensionsSpec != null ? dimensionsSpec.hashCode() : 0);
-    return result;
-  }
-}
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/RegexParseSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/RegexParseSpec.java
deleted file mode 100644
index e40d80ba4367..000000000000
--- a/processing/src/main/java/org/apache/druid/data/input/impl/RegexParseSpec.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Optional;
-import org.apache.druid.java.util.common.parsers.Parser;
-import org.apache.druid.java.util.common.parsers.RegexParser;
-
-import java.util.List;
-
-/**
- */
-public class RegexParseSpec extends ParseSpec
-{
-  private final String listDelimiter;
-  private final List<String> columns;
-  private final String pattern;
-
-  @JsonCreator
-  public RegexParseSpec(
-      @JsonProperty("timestampSpec") TimestampSpec timestampSpec,
-      @JsonProperty("dimensionsSpec") DimensionsSpec dimensionsSpec,
-      @JsonProperty("listDelimiter") String listDelimiter,
-      @JsonProperty("columns") List<String> columns,
-      @JsonProperty("pattern") String pattern
-  )
-  {
-    super(timestampSpec, dimensionsSpec);
-
-    this.listDelimiter = listDelimiter;
-    this.columns = columns;
-    this.pattern = pattern;
-  }
-
-  @JsonProperty
-  public String getListDelimiter()
-  {
-    return listDelimiter;
-  }
-
-  @JsonProperty("pattern")
-  public String getPattern()
-  {
-    return pattern;
-  }
-
-  @JsonProperty
-  public List<String> getColumns()
-  {
-    return columns;
-  }
-
-  @Override
-  public Parser<String, Object> makeParser()
-  {
-    if (columns == null) {
-      return new RegexParser(pattern, Optional.fromNullable(listDelimiter));
-    }
-    return new RegexParser(pattern, Optional.fromNullable(listDelimiter), columns);
-  }
-
-  @Override
-  public ParseSpec withTimestampSpec(TimestampSpec spec)
-  {
-    return new RegexParseSpec(spec, getDimensionsSpec(), listDelimiter, columns, pattern);
-  }
-
-  @Override
-  public ParseSpec withDimensionsSpec(DimensionsSpec spec)
-  {
-    return new RegexParseSpec(getTimestampSpec(), spec, listDelimiter, columns, pattern);
-  }
-
-}
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java
deleted file mode 100644
index 0d894f30cb2c..000000000000
--- a/processing/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.druid.java.util.common.parsers.Parser;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- */
-public class TimeAndDimsParseSpec extends ParseSpec
-{
-  @JsonCreator
-  public TimeAndDimsParseSpec(
-      @JsonProperty("timestampSpec") TimestampSpec timestampSpec,
-      @JsonProperty("dimensionsSpec") DimensionsSpec dimensionsSpec
-  )
-  {
-    super(
-        timestampSpec != null ? timestampSpec : TimestampSpec.DEFAULT,
-        dimensionsSpec != null ? dimensionsSpec : DimensionsSpec.EMPTY
-    );
-  }
-
-  @Override
-  public Parser<String, Object> makeParser()
-  {
-    return new Parser<>()
-    {
-      @Override
-      public Map<String, Object> parseToMap(String input)
-      {
-        throw new UnsupportedOperationException("not supported");
-      }
-
-      @Override
-      public void setFieldNames(Iterable<String> fieldNames)
-      {
-        throw new UnsupportedOperationException("not supported");
-      }
-
-      @Override
-      public List<String> getFieldNames()
-      {
-        throw new UnsupportedOperationException("not supported");
-      }
-    };
-  }
-
-  @Override
-  public ParseSpec withTimestampSpec(TimestampSpec spec)
-  {
-    return new TimeAndDimsParseSpec(spec, getDimensionsSpec());
-  }
-
-  @Override
-  public ParseSpec withDimensionsSpec(DimensionsSpec spec)
-  {
-    return new TimeAndDimsParseSpec(getTimestampSpec(), spec);
-  }
-}
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java
index 84490b19fce0..94e4a6fe646d 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONFlattenerMaker.java
@@ -78,7 +78,7 @@ public Iterable<String> discoverRootFields(final JsonNode obj)
                          .filter(
                              entry -> {
                                final JsonNode val = entry.getValue();
-                               // If the keepNullValues is set on the JSONParseSpec then null values should not be filtered out
+                               // If the keepNullValues is set on the JsonInputFormat then null values should not be filtered out
                                return !(val.isObject() || (!keepNullValues && val.isNull()) || (val.isArray() && !isFlatList(val)));
                              }
                          )
diff --git a/processing/src/test/java/org/apache/druid/data/input/impl/CSVParseSpecTest.java b/processing/src/test/java/org/apache/druid/data/input/impl/CSVParseSpecTest.java
deleted file mode 100644
index c8299085c0ea..000000000000
--- a/processing/src/test/java/org/apache/druid/data/input/impl/CSVParseSpecTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-public class CSVParseSpecTest
-{
-  @Test(expected = IllegalArgumentException.class)
-  public void testComma()
-  {
-    @SuppressWarnings("unused") // expected exception
-    final ParseSpec spec = new CSVParseSpec(
-        new TimestampSpec(
-            "timestamp",
-            "auto",
-            null
-        ),
-        new DimensionsSpec(DimensionsSpec.getDefaultSchemas(Arrays.asList("a,", "b"))),
-        ",",
-        Collections.singletonList("a,"),
-        false,
-        0
-    );
-  }
-}
diff --git a/processing/src/test/java/org/apache/druid/data/input/impl/DelimitedParseSpecTest.java b/processing/src/test/java/org/apache/druid/data/input/impl/DelimitedParseSpecTest.java
deleted file mode 100644
index 0d3b48640351..000000000000
--- a/processing/src/test/java/org/apache/druid/data/input/impl/DelimitedParseSpecTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.druid.jackson.DefaultObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-
-public class DelimitedParseSpecTest
-{
-  private final ObjectMapper jsonMapper = new DefaultObjectMapper();
-
-  @Test
-  public void testSerde() throws IOException
-  {
-    DelimitedParseSpec spec = new DelimitedParseSpec(
-        new TimestampSpec("abc", "iso", null),
-        new DimensionsSpec(DimensionsSpec.getDefaultSchemas(Collections.singletonList("abc"))),
-        "\u0001",
-        "\u0002",
-        Collections.singletonList("abc"),
-        false,
-        0
-    );
-    final DelimitedParseSpec serde = jsonMapper.readValue(
-        jsonMapper.writeValueAsString(spec),
-        DelimitedParseSpec.class
-    );
-    Assert.assertEquals("abc", serde.getTimestampSpec().getTimestampColumn());
-    Assert.assertEquals("iso", serde.getTimestampSpec().getTimestampFormat());
-
-    Assert.assertEquals(Collections.singletonList("abc"), serde.getColumns());
-    Assert.assertEquals("\u0001", serde.getDelimiter());
-    Assert.assertEquals("\u0002", serde.getListDelimiter());
-    Assert.assertEquals(Collections.singletonList("abc"), serde.getDimensionsSpec().getDimensionNames());
-  }
-
-  @Test(expected = IllegalArgumentException.class)
-  public void testComma()
-  {
-    @SuppressWarnings("unused") // expected exception
-    final ParseSpec spec = new DelimitedParseSpec(
-        new TimestampSpec(
-            "timestamp",
-            "auto",
-            null
-        ),
-        new DimensionsSpec(DimensionsSpec.getDefaultSchemas(Arrays.asList("a,", "b"))),
-        ",",
-        null,
-        Collections.singletonList("a,"),
-        false,
-        0
-    );
-  }
-
-  @Test(expected = IllegalArgumentException.class)
-  public void testDefaultColumnList()
-  {
-    @SuppressWarnings("unused") // expected exception
-    final DelimitedParseSpec spec = new DelimitedParseSpec(
-        new TimestampSpec(
-            "timestamp",
-            "auto",
-            null
-        ),
-        new DimensionsSpec(DimensionsSpec.getDefaultSchemas(Arrays.asList("a", "b"))),
-        ",",
-        null,
-        null,
-        false,
-        0
-    );
-  }
-}
diff --git a/processing/src/test/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpecTest.java b/processing/src/test/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpecTest.java
deleted file mode 100644
index 788fb0a45229..000000000000
--- a/processing/src/test/java/org/apache/druid/data/input/impl/JSONLowercaseParseSpecTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import junit.framework.Assert;
-import org.apache.druid.java.util.common.parsers.Parser;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.Map;
-
-public class JSONLowercaseParseSpecTest
-{
-  @Test
-  public void testLowercasing()
-  {
-    JSONLowercaseParseSpec spec = new JSONLowercaseParseSpec(
-        new TimestampSpec(
-            "timestamp",
-            "auto",
-            null
-        ),
-        new DimensionsSpec(DimensionsSpec.getDefaultSchemas(Arrays.asList("A", "B")))
-    );
-    Parser parser = spec.makeParser();
-    Map<String, Object> event = parser.parseToMap("{\"timestamp\":\"2015-01-01\",\"A\":\"foo\"}");
-    Assert.assertEquals("foo", event.get("a"));
-  }
-}
diff --git a/processing/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java b/processing/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java
deleted file mode 100644
index 91f6b5084bc0..000000000000
--- a/processing/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableList;
-import nl.jqno.equalsverifier.EqualsVerifier;
-import org.apache.druid.jackson.DefaultObjectMapper;
-import org.apache.druid.java.util.common.parsers.JSONPathFieldSpec;
-import org.apache.druid.java.util.common.parsers.JSONPathFieldType;
-import org.apache.druid.java.util.common.parsers.JSONPathSpec;
-import org.apache.druid.java.util.common.parsers.Parser;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-public class JSONParseSpecTest
-{
-  private final ObjectMapper jsonMapper = new DefaultObjectMapper();
-
-  @Test
-  public void testParseRow()
-  {
-    final JSONParseSpec parseSpec = new JSONParseSpec(
-        new TimestampSpec("timestamp", "iso", null),
-        new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("bar", "foo"))),
-        new JSONPathSpec(
-            true,
-            ImmutableList.of(
-                new JSONPathFieldSpec(JSONPathFieldType.ROOT, "root_baz", "baz"),
-                new JSONPathFieldSpec(JSONPathFieldType.ROOT, "root_baz2", "baz2"),
-                new JSONPathFieldSpec(JSONPathFieldType.PATH, "path_omg", "$.o.mg"),
-                new JSONPathFieldSpec(JSONPathFieldType.PATH, "path_omg2", "$.o.mg2"),
-                new JSONPathFieldSpec(JSONPathFieldType.JQ, "jq_omg", ".o.mg"),
-                new JSONPathFieldSpec(JSONPathFieldType.JQ, "jq_omg2", ".o.mg2")
-            )
-        ),
-        null,
-        false
-    );
-
-    final Map<String, Object> expected = new HashMap<>();
-    expected.put("foo", "x");
-    expected.put("baz", 4L);
-    expected.put("root_baz", 4L);
-    expected.put("root_baz2", null);
-    expected.put("path_omg", 1L);
-    expected.put("path_omg2", null);
-    expected.put("jq_omg", 1L);
-    expected.put("jq_omg2", null);
-
-    final Parser<String, Object> parser = parseSpec.makeParser();
-    final Map<String, Object> parsedRow = parser.parseToMap("{\"bar\":null,\"foo\":\"x\",\"baz\":4,\"o\":{\"mg\":1}}");
-    Assert.assertNotNull(parsedRow);
-    Assert.assertEquals(expected, parsedRow);
-    Assert.assertNull(parsedRow.get("bar"));
-    Assert.assertNull(parsedRow.get("buzz"));
-    Assert.assertNull(parsedRow.get("root_baz2"));
-    Assert.assertNull(parsedRow.get("jq_omg2"));
-    Assert.assertNull(parsedRow.get("path_omg2"));
-  }
-
-  @Test
-  public void testParseRowWithConditional()
-  {
-    final JSONParseSpec parseSpec = new JSONParseSpec(
-        new TimestampSpec("timestamp", "iso", null),
-        new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("foo"))),
-        new JSONPathSpec(
-            true,
-            ImmutableList.of(
-                new JSONPathFieldSpec(JSONPathFieldType.PATH, "foo", "$.[?(@.maybe_object)].maybe_object.foo.test"),
-                new JSONPathFieldSpec(JSONPathFieldType.PATH, "baz", "$.maybe_object_2.foo.test"),
-                new JSONPathFieldSpec(JSONPathFieldType.PATH, "bar", "$.[?(@.something_else)].something_else.foo")
-            )
-        ),
-        null,
-        false
-    );
-
-    final Map<String, Object> expected = new HashMap<>();
-    expected.put("foo", Collections.singletonList(null));
-    expected.put("baz", null);
-    expected.put("bar", Collections.singletonList("test"));
-
-    final Parser<String, Object> parser = parseSpec.makeParser();
-    final Map<String, Object> parsedRow = parser.parseToMap("{\"something_else\": {\"foo\": \"test\"}}");
-
-    Assert.assertNotNull(parsedRow);
-    Assert.assertEquals(expected, parsedRow);
-  }
-
-  @Test
-  public void testParseRowWithNullsInArrays()
-  {
-    final JSONParseSpec parseSpec = new JSONParseSpec(
-        new TimestampSpec("timestamp", "iso", null),
-        new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("foo"))),
-        new JSONPathSpec(
-            true,
-            ImmutableList.of(
-                // https://github.com/apache/druid/issues/6653 $.x.y.z where y is missing
-                new JSONPathFieldSpec(JSONPathFieldType.PATH, "foo", "$.baz.[?(@.maybe_object)].maybe_object"),
-                // https://github.com/apache/druid/issues/6653 $.x.y.z where y is from an array and is null
-                new JSONPathFieldSpec(JSONPathFieldType.PATH, "nullFoo", "$.nullFoo.[?(@.value)][0].foo"),
-                new JSONPathFieldSpec(JSONPathFieldType.PATH, "baz", "$.baz"),
-                // $.x.y.z where x is from an array and is null
-                new JSONPathFieldSpec(JSONPathFieldType.PATH, "nullBaz", "$.baz[1].foo.maybe_object"),
-                new JSONPathFieldSpec(JSONPathFieldType.PATH, "bar", "$.[?(@.something_else)].something_else.foo")
-            )
-        ),
-        null,
-        false
-    );
-
-    final Map<String, Object> expected = new HashMap<>();
-    expected.put("foo", new ArrayList<>());
-    expected.put("baz", Arrays.asList("1", null, "2", null));
-    expected.put("bar", Collections.singletonList("test"));
-    expected.put("nullFoo", new ArrayList<>());
-    expected.put("nullBaz", null);
-
-    final Parser<String, Object> parser = parseSpec.makeParser();
-    final Map<String, Object> parsedRow = parser.parseToMap("{\"baz\":[\"1\",null,\"2\",null],\"nullFoo\":{\"value\":[null,null]},\"something_else\": {\"foo\": \"test\"}}");
-
-    Assert.assertNotNull(parsedRow);
-    Assert.assertEquals(expected, parsedRow);
-  }
-
-  @Test
-  public void testSerde() throws IOException
-  {
-    HashMap<String, Boolean> feature = new HashMap<>();
-    feature.put("ALLOW_UNQUOTED_CONTROL_CHARS", true);
-    JSONParseSpec spec = new JSONParseSpec(
-        new TimestampSpec("timestamp", "iso", null),
-        new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("bar", "foo"))),
-        null,
-        feature,
-        false
-    );
-
-    final JSONParseSpec serde = (JSONParseSpec) jsonMapper.readValue(
-        jsonMapper.writeValueAsString(spec),
-        ParseSpec.class
-    );
-    Assert.assertEquals("timestamp", serde.getTimestampSpec().getTimestampColumn());
-    Assert.assertEquals("iso", serde.getTimestampSpec().getTimestampFormat());
-
-    Assert.assertEquals(Arrays.asList("bar", "foo"), serde.getDimensionsSpec().getDimensionNames());
-    Assert.assertEquals(feature, serde.getFeatureSpec());
-  }
-
-  @Test
-  public void testEquals()
-  {
-    EqualsVerifier.forClass(JSONParseSpec.class)
-                  .usingGetClass()
-                  .withPrefabValues(
-                      DimensionsSpec.class,
-                      new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("bar", "foo"))),
-                      new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("baz", "buzz")))
-                  )
-                  .withPrefabValues(
-                      ObjectMapper.class,
-                      new ObjectMapper(),
-                      new ObjectMapper()
-                  )
-                  .withIgnoredFields("objectMapper")
-                  .verify();
-  }
-}
diff --git a/processing/src/test/java/org/apache/druid/data/input/impl/JavaScriptParseSpecTest.java b/processing/src/test/java/org/apache/druid/data/input/impl/JavaScriptParseSpecTest.java
deleted file mode 100644
index bf9c0e566841..000000000000
--- a/processing/src/test/java/org/apache/druid/data/input/impl/JavaScriptParseSpecTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.databind.InjectableValues;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableMap;
-import org.apache.druid.jackson.DefaultObjectMapper;
-import org.apache.druid.java.util.common.parsers.Parser;
-import org.apache.druid.js.JavaScriptConfig;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-
-/**
- */
-public class JavaScriptParseSpecTest
-{
-  private final ObjectMapper jsonMapper = new DefaultObjectMapper();
-
-  @Rule
-  public ExpectedException expectedException = ExpectedException.none();
-
-  @Test
-  public void testSerde() throws IOException
-  {
-    jsonMapper.setInjectableValues(
-        new InjectableValues.Std().addValue(
-            JavaScriptConfig.class,
-            JavaScriptConfig.getEnabledInstance()
-        )
-    );
-    JavaScriptParseSpec spec = new JavaScriptParseSpec(
-        new TimestampSpec("abc", "iso", null),
-        new DimensionsSpec(DimensionsSpec.getDefaultSchemas(Collections.singletonList("abc"))),
-        "abc",
-        JavaScriptConfig.getEnabledInstance()
-    );
-    final JavaScriptParseSpec serde = (JavaScriptParseSpec) jsonMapper.readValue(
-        jsonMapper.writeValueAsString(spec),
-        ParseSpec.class
-    );
-    Assert.assertEquals("abc", serde.getTimestampSpec().getTimestampColumn());
-    Assert.assertEquals("iso", serde.getTimestampSpec().getTimestampFormat());
-
-    Assert.assertEquals("abc", serde.getFunction());
-    Assert.assertEquals(Collections.singletonList("abc"), serde.getDimensionsSpec().getDimensionNames());
-  }
-
-  @Test
-  public void testMakeParser()
-  {
-    final JavaScriptConfig config = JavaScriptConfig.getEnabledInstance();
-    JavaScriptParseSpec spec = new JavaScriptParseSpec(
-        new TimestampSpec("abc", "iso", null),
-        new DimensionsSpec(DimensionsSpec.getDefaultSchemas(Collections.singletonList("abc"))),
-        "function(str) { var parts = str.split(\"-\"); return { one: parts[0], two: parts[1] } }",
-        config
-    );
-
-    final Parser<String, Object> parser = spec.makeParser();
-    final Map<String, Object> obj = parser.parseToMap("x-y");
-    Assert.assertEquals(ImmutableMap.of("one", "x", "two", "y"), obj);
-  }
-
-  @Test
-  public void testMakeParserNotAllowed()
-  {
-    final JavaScriptConfig config = new JavaScriptConfig(false);
-    JavaScriptParseSpec spec = new JavaScriptParseSpec(
-        new TimestampSpec("abc", "iso", null),
-        new DimensionsSpec(DimensionsSpec.getDefaultSchemas(Collections.singletonList("abc"))),
-        "abc",
-        config
-    );
-
-    expectedException.expect(IllegalStateException.class);
-    expectedException.expectMessage("JavaScript is disabled");
-    spec.makeParser();
-  }
-}
diff --git a/processing/src/test/java/org/apache/druid/data/input/impl/ParseSpecTest.java b/processing/src/test/java/org/apache/druid/data/input/impl/ParseSpecTest.java
deleted file mode 100644
index 96f7fd9ee394..000000000000
--- a/processing/src/test/java/org/apache/druid/data/input/impl/ParseSpecTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import org.apache.druid.java.util.common.jackson.JacksonUtils;
-import org.apache.druid.java.util.common.parsers.ParseException;
-import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-
-public class ParseSpecTest
-{
-  @Rule
-  public ExpectedException expectedException = ExpectedException.none();
-
-  private ObjectMapper mapper;
-
-  @Before
-  public void setUp()
-  {
-    // Similar to configs from DefaultObjectMapper, which we cannot use here since we're in druid-api.
-    mapper = new ObjectMapper();
-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-    mapper.configure(MapperFeature.AUTO_DETECT_GETTERS, false);
-    mapper.configure(MapperFeature.AUTO_DETECT_FIELDS, false);
-    mapper.configure(MapperFeature.AUTO_DETECT_IS_GETTERS, false);
-    mapper.configure(MapperFeature.AUTO_DETECT_SETTERS, false);
-    mapper.configure(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS, false);
-  }
-
-  @Test(expected = ParseException.class)
-  public void testDuplicateNames()
-  {
-    @SuppressWarnings("unused") // expected exception
-    final ParseSpec spec = new DelimitedParseSpec(
-        new TimestampSpec(
-            "timestamp",
-            "auto",
-            null
-        ),
-        new DimensionsSpec(DimensionsSpec.getDefaultSchemas(Arrays.asList("a", "b", "a"))),
-        ",",
-        " ",
-        Arrays.asList("a", "b"),
-        false,
-        0
-    );
-  }
-
-  @Test(expected = IllegalArgumentException.class)
-  public void testDimAndDimExcluOverlap()
-  {
-    @SuppressWarnings("unused") // expected exception
-    final ParseSpec spec = new DelimitedParseSpec(
-        new TimestampSpec(
-            "timestamp",
-            "auto",
-            null
-        ),
-        DimensionsSpec.builder()
-                      .setDimensions(DimensionsSpec.getDefaultSchemas(Arrays.asList("a", "B")))
-                      .setDimensionExclusions(Collections.singletonList("B"))
-                      .build(),
-        ",",
-        null,
-        Arrays.asList("a", "B"),
-        false,
-        0
-    );
-  }
-
-  @Test
-  public void testDimExclusionDuplicate()
-  {
-    @SuppressWarnings("unused") // expected exception
-    final ParseSpec spec = new DelimitedParseSpec(
-        new TimestampSpec(
-            "timestamp",
-            "auto",
-            null
-        ),
-        DimensionsSpec.builder()
-                      .setDimensions(DimensionsSpec.getDefaultSchemas(Collections.singletonList("a")))
-                      .setDimensionExclusions(Lists.newArrayList("B", "B"))
-                      .build(),
-        ",",
-        null,
-        Arrays.asList("a", "B"),
-        false,
-        0
-    );
-  }
-
-  @Test
-  public void testDefaultTimestampSpec()
-  {
-    expectedException.expect(NullPointerException.class);
-    expectedException.expectMessage("parseSpec requires timestampSpec");
-    @SuppressWarnings("unused") // expected exception
-    final ParseSpec spec = new DelimitedParseSpec(
-        null,
-        DimensionsSpec.builder()
-                      .setDimensions(DimensionsSpec.getDefaultSchemas(Collections.singletonList("a")))
-                      .setDimensionExclusions(Lists.newArrayList("B", "B"))
-                      .build(),
-        ",",
-        null,
-        Arrays.asList("a", "B"),
-        false,
-        0
-    );
-  }
-
-  @Test
-  public void testDimensionSpecRequired()
-  {
-    expectedException.expect(NullPointerException.class);
-    expectedException.expectMessage("parseSpec requires dimensionSpec");
-    @SuppressWarnings("unused") // expected exception
-    final ParseSpec spec = new DelimitedParseSpec(
-        new TimestampSpec(
-            "timestamp",
-            "auto",
-            null
-        ),
-        null,
-        ",",
-        null,
-        Arrays.asList("a", "B"),
-        false,
-        0
-    );
-  }
-
-  @Test
-  public void testSerde() throws IOException
-  {
-    final String json = "{"
-                        + "\"format\":\"timeAndDims\", "
-                        + "\"timestampSpec\": {\"column\":\"timestamp\"}, "
-                        + "\"dimensionsSpec\":{}"
-                        + "}";
-
-    final Object mapValue = mapper.readValue(json, JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT);
-    final ParseSpec parseSpec = mapper.convertValue(mapValue, ParseSpec.class);
-
-    Assert.assertEquals(TimeAndDimsParseSpec.class, parseSpec.getClass());
-    Assert.assertEquals("timestamp", parseSpec.getTimestampSpec().getTimestampColumn());
-    Assert.assertEquals(ImmutableList.of(), parseSpec.getDimensionsSpec().getDimensionNames());
-
-    // Test round-trip.
-    Assert.assertEquals(
-        parseSpec,
-        mapper.readValue(mapper.writeValueAsString(parseSpec), ParseSpec.class)
-    );
-  }
-
-  @Test
-  public void testBadTypeSerde() throws IOException
-  {
-    final String json = "{"
-                        + "\"format\":\"foo\", "
-                        + "\"timestampSpec\": {\"column\":\"timestamp\"}, "
-                        + "\"dimensionsSpec\":{}"
-                        + "}";
-
-    final Object mapValue = mapper.readValue(json, JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT);
-
-    expectedException.expect(IllegalArgumentException.class);
-    expectedException.expectCause(CoreMatchers.instanceOf(JsonMappingException.class));
-    expectedException.expectMessage("Could not resolve type id 'foo' as a subtype");
-    mapper.convertValue(mapValue, ParseSpec.class);
-  }
-}
diff --git a/processing/src/test/java/org/apache/druid/data/input/impl/RegexParseSpecTest.java b/processing/src/test/java/org/apache/druid/data/input/impl/RegexParseSpecTest.java
deleted file mode 100644
index 80aac74b12ce..000000000000
--- a/processing/src/test/java/org/apache/druid/data/input/impl/RegexParseSpecTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.druid.jackson.DefaultObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.Collections;
-
-/**
- */
-public class RegexParseSpecTest
-{
-  private final ObjectMapper jsonMapper = new DefaultObjectMapper();
-
-  @Test
-  public void testSerde() throws IOException
-  {
-    RegexParseSpec spec = new RegexParseSpec(
-        new TimestampSpec("abc", "iso", null),
-        new DimensionsSpec(DimensionsSpec.getDefaultSchemas(Collections.singletonList("abc"))),
-        "\u0001",
-        Collections.singletonList("abc"),
-        "abc"
-    );
-    final RegexParseSpec serde = (RegexParseSpec) jsonMapper.readValue(
-        jsonMapper.writeValueAsString(spec),
-        ParseSpec.class
-    );
-    Assert.assertEquals("abc", serde.getTimestampSpec().getTimestampColumn());
-    Assert.assertEquals("iso", serde.getTimestampSpec().getTimestampFormat());
-
-    Assert.assertEquals("abc", serde.getPattern());
-    Assert.assertEquals("\u0001", serde.getListDelimiter());
-    Assert.assertEquals(Collections.singletonList("abc"), serde.getDimensionsSpec().getDimensionNames());
-  }
-}
diff --git a/processing/src/test/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpecTest.java b/processing/src/test/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpecTest.java
deleted file mode 100644
index 3278e6a29ebd..000000000000
--- a/processing/src/test/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpecTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.data.input.impl;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableList;
-import junit.framework.Assert;
-import org.junit.Test;
-
-/**
- */
-public class TimeAndDimsParseSpecTest
-{
-  private final ObjectMapper mapper = new ObjectMapper();
-
-  @Test
-  public void testSerdeWithNulls() throws Exception
-  {
-    String jsonStr = "{ \"format\":\"timeAndDims\" }";
-
-    ParseSpec actual = mapper.readValue(
-        mapper.writeValueAsString(
-            mapper.readValue(jsonStr, ParseSpec.class)
-        ),
-        ParseSpec.class
-    );
-
-    Assert.assertEquals(new TimeAndDimsParseSpec(null, null), actual);
-  }
-
-  @Test
-  public void testSerdeWithNonNulls() throws Exception
-  {
-    String jsonStr = "{"
-                     + "\"format\":\"timeAndDims\","
-                     + "\"timestampSpec\": { \"column\": \"tcol\" },"
-                     + "\"dimensionsSpec\": { \"dimensions\": [\"host\"] }"
-                     + "}";
-
-    ParseSpec actual = mapper.readValue(
-        mapper.writeValueAsString(
-            mapper.readValue(jsonStr, ParseSpec.class)
-        ),
-        ParseSpec.class
-    );
-
-    Assert.assertEquals(
-        new TimeAndDimsParseSpec(
-            new TimestampSpec("tcol", null, null),
-            new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("host")))
-        ),
-        actual
-    );
-  }
-}
diff --git a/website/.spelling b/website/.spelling
index 0cdf3387644b..ccb105a010a9 100644
--- a/website/.spelling
+++ b/website/.spelling
@@ -214,8 +214,6 @@ OpenLDAP
 OpenTSDB
 OutputStream
 ParAccel
-ParseSpec
-ParseSpecs
 PathChildrenCache
 Protobuf
 protobuf