diff --git a/core/src/main/java/org/elasticsearch/index/query/BoostingQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/BoostingQueryParser.java
index 699d23d6148..5e0b9f21da6 100644
--- a/core/src/main/java/org/elasticsearch/index/query/BoostingQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/BoostingQueryParser.java
@@ -29,10 +29,6 @@ import java.io.IOException;
  */
 public class BoostingQueryParser extends BaseQueryParser<BoostingQueryBuilder> {
 
-    @Inject
-    public BoostingQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{BoostingQueryBuilder.NAME};
diff --git a/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java
index 65f4fa34ebe..2114a1cf7b7 100644
--- a/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java
@@ -29,10 +29,6 @@ import java.io.IOException;
  */
 public class CommonTermsQueryParser extends BaseQueryParser<CommonTermsQueryBuilder> {
 
-    @Inject
-    public CommonTermsQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[] { CommonTermsQueryBuilder.NAME };
diff --git a/core/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryParser.java
index ba261e8fcdd..aae89b55a5c 100644
--- a/core/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryParser.java
@@ -33,10 +33,6 @@ public class ConstantScoreQueryParser extends BaseQueryParser<ConstantScoreQuery
 
     private static final ParseField INNER_QUERY_FIELD = new ParseField("filter", "query");
 
-    @Inject
-    public ConstantScoreQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{ConstantScoreQueryBuilder.NAME, Strings.toCamelCase(ConstantScoreQueryBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/DisMaxQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/DisMaxQueryParser.java
index 39bad2d2caf..60243d8c399 100644
--- a/core/src/main/java/org/elasticsearch/index/query/DisMaxQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/DisMaxQueryParser.java
@@ -32,10 +32,6 @@ import java.util.List;
  */
 public class DisMaxQueryParser extends BaseQueryParser<DisMaxQueryBuilder> {
 
-    @Inject
-    public DisMaxQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{DisMaxQueryBuilder.NAME, Strings.toCamelCase(DisMaxQueryBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java
index bd584bc89dd..fe7e3c50611 100644
--- a/core/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java
@@ -29,10 +29,6 @@ import java.io.IOException;
  */
 public class ExistsQueryParser extends BaseQueryParser<ExistsQueryBuilder> {
 
-    @Inject
-    public ExistsQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{ExistsQueryBuilder.NAME};
diff --git a/core/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java
index ad77039ee90..b78ebbfce60 100644
--- a/core/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java
@@ -29,10 +29,6 @@ import java.io.IOException;
  */
 public class FieldMaskingSpanQueryParser extends BaseQueryParser<FieldMaskingSpanQueryBuilder> {
 
-    @Inject
-    public FieldMaskingSpanQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{FieldMaskingSpanQueryBuilder.NAME, Strings.toCamelCase(FieldMaskingSpanQueryBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/FuzzyQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/FuzzyQueryParser.java
index 694a3039086..3f50dac4f8d 100644
--- a/core/src/main/java/org/elasticsearch/index/query/FuzzyQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/FuzzyQueryParser.java
@@ -31,10 +31,6 @@ public class FuzzyQueryParser extends BaseQueryParser {
 
     private static final ParseField FUZZINESS = Fuzziness.FIELD.withDeprecation("min_similarity");
 
-    @Inject
-    public FuzzyQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{ FuzzyQueryBuilder.NAME };
diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryParser.java
index 1476c2e4b97..d8071c643e7 100644
--- a/core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryParser.java
@@ -58,10 +58,6 @@ public class GeoBoundingBoxQueryParser extends BaseQueryParserTemp {
 
     public static final String FIELD = "field";
 
-    @Inject
-    public GeoBoundingBoxQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{GeoBoundingBoxQueryBuilder.NAME, "geoBbox", "geo_bounding_box", "geoBoundingBox"};
diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryParser.java
index 807ebdb0754..2ba72533ade 100644
--- a/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryParser.java
@@ -44,10 +44,6 @@ import java.io.IOException;
  */
 public class GeoDistanceQueryParser extends BaseQueryParserTemp {
 
-    @Inject
-    public GeoDistanceQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{GeoDistanceQueryBuilder.NAME, "geoDistance"};
diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryParser.java
index 7f16aea8ad2..6112cbbcc06 100644
--- a/core/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryParser.java
@@ -56,10 +56,6 @@ public class GeoDistanceRangeQueryParser extends BaseQueryParser<GeoDistanceRang
     public static final ParseField COERCE_FIELD = new ParseField("coerce", "normalize");
     public static final ParseField IGNORE_MALFORMED_FIELD = new ParseField("ignore_malformed");
 
-    @Inject
-    public GeoDistanceRangeQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{GeoDistanceRangeQueryBuilder.NAME, "geoDistanceRange"};
diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryParser.java
index 8b7c4e543b8..4389399f9c0 100644
--- a/core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryParser.java
@@ -48,10 +48,6 @@ public class GeoPolygonQueryParser extends BaseQueryParser<GeoPolygonQueryBuilde
     public static final ParseField IGNORE_MALFORMED_FIELD = new ParseField("ignore_malformed");
     public static final ParseField POINTS_FIELD = new ParseField("points");
 
-    @Inject
-    public GeoPolygonQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{GeoPolygonQueryBuilder.NAME, "geoPolygon"};
diff --git a/core/src/main/java/org/elasticsearch/index/query/IdsQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/IdsQueryParser.java
index 661214098cd..40c91674f15 100644
--- a/core/src/main/java/org/elasticsearch/index/query/IdsQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/IdsQueryParser.java
@@ -32,10 +32,6 @@ import java.util.List;
  */
 public class IdsQueryParser extends BaseQueryParser<IdsQueryBuilder> {
 
-    @Inject
-    public IdsQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{IdsQueryBuilder.NAME};
diff --git a/core/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java
index b7a93acf2b8..34d9f333176 100644
--- a/core/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java
@@ -35,10 +35,6 @@ public class IndicesQueryParser extends BaseQueryParser {
     private static final ParseField QUERY_FIELD = new ParseField("query", "filter");
     private static final ParseField NO_MATCH_QUERY = new ParseField("no_match_query", "no_match_filter");
 
-    @Inject
-    public IndicesQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{IndicesQueryBuilder.NAME};
diff --git a/core/src/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java
index 4066c75f89b..92bb07a727e 100644
--- a/core/src/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java
@@ -30,10 +30,6 @@ import java.io.IOException;
  */
 public class MatchAllQueryParser extends BaseQueryParser<MatchAllQueryBuilder> {
 
-    @Inject
-    public MatchAllQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{MatchAllQueryBuilder.NAME, Strings.toCamelCase(MatchAllQueryBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/MatchNoneQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/MatchNoneQueryParser.java
index 3536a5d9018..8e9e657f1cd 100644
--- a/core/src/main/java/org/elasticsearch/index/query/MatchNoneQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/MatchNoneQueryParser.java
@@ -27,10 +27,6 @@ import java.io.IOException;
 
 public class MatchNoneQueryParser extends BaseQueryParser {
 
-    @Inject
-    public MatchNoneQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{MatchNoneQueryBuilder.NAME, Strings.toCamelCase(MatchNoneQueryBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/MatchQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/MatchQueryParser.java
index 93bd2be563e..5160c555d06 100644
--- a/core/src/main/java/org/elasticsearch/index/query/MatchQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/MatchQueryParser.java
@@ -33,10 +33,6 @@ import java.io.IOException;
  */
 public class MatchQueryParser extends BaseQueryParser {
 
-    @Inject
-    public MatchQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{
diff --git a/core/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java
index 1dd6bd1df56..84be1cbe365 100644
--- a/core/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java
@@ -29,10 +29,6 @@ import java.io.IOException;
  */
 public class MissingQueryParser extends BaseQueryParser<MissingQueryBuilder> {
 
-    @Inject
-    public MissingQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{MissingQueryBuilder.NAME};
diff --git a/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryParser.java
index 9b5199e6f21..de9b1efa837 100644
--- a/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryParser.java
@@ -37,10 +37,6 @@ import java.util.Map;
  */
 public class MultiMatchQueryParser extends BaseQueryParserTemp {
 
-    @Inject
-    public MultiMatchQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{
diff --git a/core/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java
index ce6770a0698..4ab67ff09a4 100644
--- a/core/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java
@@ -42,7 +42,6 @@ public class NestedQueryParser extends BaseQueryParser<NestedQueryBuilder> {
     private static final ParseField FILTER_FIELD = new ParseField("filter").withAllDeprecated("query");
     private static final NestedQueryBuilder PROTOTYPE = new NestedQueryBuilder("", EmptyQueryBuilder.PROTOTYPE);
 
-
     @Override
     public String[] names() {
         return new String[]{NestedQueryBuilder.NAME, Strings.toCamelCase(NestedQueryBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/NotQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/NotQueryParser.java
index f5000311530..37a1c2dc0a4 100644
--- a/core/src/main/java/org/elasticsearch/index/query/NotQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/NotQueryParser.java
@@ -32,10 +32,6 @@ public class NotQueryParser extends BaseQueryParser<NotQueryBuilder> {
 
     private static final ParseField QUERY_FIELD = new ParseField("query", "filter");
 
-    @Inject
-    public NotQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{NotQueryBuilder.NAME};
diff --git a/core/src/main/java/org/elasticsearch/index/query/PrefixQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/PrefixQueryParser.java
index eac29fa0ca0..1b89cd2bcdd 100644
--- a/core/src/main/java/org/elasticsearch/index/query/PrefixQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/PrefixQueryParser.java
@@ -32,10 +32,6 @@ public class PrefixQueryParser extends BaseQueryParser<PrefixQueryBuilder> {
 
     private static final ParseField NAME_FIELD = new ParseField("_name").withAllDeprecated("query name is not supported in short version of prefix query");
 
-    @Inject
-    public PrefixQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{PrefixQueryBuilder.NAME};
diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryFilterParser.java b/core/src/main/java/org/elasticsearch/index/query/QueryFilterParser.java
index 84e4a59b1bc..0b38776f2ff 100644
--- a/core/src/main/java/org/elasticsearch/index/query/QueryFilterParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/QueryFilterParser.java
@@ -31,10 +31,6 @@ import java.io.IOException;
 @Deprecated
 public class QueryFilterParser extends BaseQueryParser<QueryFilterBuilder> {
 
-    @Inject
-    public QueryFilterParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{QueryFilterBuilder.NAME};
diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java
index fdf1a18029e..5bf6a193474 100644
--- a/core/src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java
@@ -37,10 +37,6 @@ public class QueryStringQueryParser extends BaseQueryParser {
 
     private static final ParseField FUZZINESS = Fuzziness.FIELD.withDeprecation("fuzzy_min_sim");
 
-    @Inject
-    public QueryStringQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{QueryStringQueryBuilder.NAME, Strings.toCamelCase(QueryStringQueryBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java
index d10f6b04a84..b9a3783b4fa 100644
--- a/core/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java
@@ -33,10 +33,6 @@ public class RangeQueryParser extends BaseQueryParser<RangeQueryBuilder> {
     private static final ParseField FIELDDATA_FIELD = new ParseField("fielddata").withAllDeprecated("[no replacement]");
     private static final ParseField NAME_FIELD = new ParseField("_name").withAllDeprecated("query name is not supported in short version of range query");
 
-    @Inject
-    public RangeQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{RangeQueryBuilder.NAME};
diff --git a/core/src/main/java/org/elasticsearch/index/query/RegexpQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/RegexpQueryParser.java
index 66fd44a3c61..e8061d83e86 100644
--- a/core/src/main/java/org/elasticsearch/index/query/RegexpQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/RegexpQueryParser.java
@@ -32,10 +32,6 @@ public class RegexpQueryParser extends BaseQueryParser<RegexpQueryBuilder> {
 
     private static final ParseField NAME_FIELD = new ParseField("_name").withAllDeprecated("query name is not supported in short version of regexp query");
 
-    @Inject
-    public RegexpQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{RegexpQueryBuilder.NAME};
diff --git a/core/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java
index b37844e9f96..956fd21ed33 100644
--- a/core/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java
@@ -35,10 +35,6 @@ import java.util.Map;
  */
 public class ScriptQueryParser extends BaseQueryParser<ScriptQueryBuilder> {
 
-    @Inject
-    public ScriptQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{ScriptQueryBuilder.NAME};
diff --git a/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringParser.java b/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringParser.java
index 89f94ed2fac..690c376e00a 100644
--- a/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringParser.java
@@ -62,11 +62,6 @@ import java.util.Map;
  */
 public class SimpleQueryStringParser extends BaseQueryParser<SimpleQueryStringBuilder> {
 
-    @Inject
-    public SimpleQueryStringParser() {
-
-    }
-
     @Override
     public String[] names() {
         return new String[]{SimpleQueryStringBuilder.NAME, Strings.toCamelCase(SimpleQueryStringBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanContainingQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanContainingQueryParser.java
index affc85388df..22cd225ebf4 100644
--- a/core/src/main/java/org/elasticsearch/index/query/SpanContainingQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/SpanContainingQueryParser.java
@@ -30,10 +30,6 @@ import java.io.IOException;
  */
 public class SpanContainingQueryParser extends BaseQueryParser<SpanContainingQueryBuilder> {
 
-    @Inject
-    public SpanContainingQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{SpanContainingQueryBuilder.NAME, Strings.toCamelCase(SpanContainingQueryBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java
index 995bb4dc49a..504cac16966 100644
--- a/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java
@@ -30,10 +30,6 @@ import java.io.IOException;
  */
 public class SpanFirstQueryParser extends BaseQueryParser<SpanFirstQueryBuilder> {
 
-    @Inject
-    public SpanFirstQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{SpanFirstQueryBuilder.NAME, Strings.toCamelCase(SpanFirstQueryBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryParser.java
index 77e9defab3f..7ecfd7398eb 100644
--- a/core/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryParser.java
@@ -31,10 +31,6 @@ public class SpanMultiTermQueryParser extends BaseQueryParser<SpanMultiTermQuery
 
     public static final String MATCH_NAME = "match";
 
-    @Inject
-    public SpanMultiTermQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{SpanMultiTermQueryBuilder.NAME, Strings.toCamelCase(SpanMultiTermQueryBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanNearQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanNearQueryParser.java
index cc6d8bca284..f522a6cacfd 100644
--- a/core/src/main/java/org/elasticsearch/index/query/SpanNearQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/SpanNearQueryParser.java
@@ -32,10 +32,6 @@ import java.util.List;
  */
 public class SpanNearQueryParser extends BaseQueryParser<SpanNearQueryBuilder> {
 
-    @Inject
-    public SpanNearQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{SpanNearQueryBuilder.NAME, Strings.toCamelCase(SpanNearQueryBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanNotQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanNotQueryParser.java
index bc9ee51226b..a1a62fcebd7 100644
--- a/core/src/main/java/org/elasticsearch/index/query/SpanNotQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/SpanNotQueryParser.java
@@ -30,10 +30,6 @@ import java.io.IOException;
  */
 public class SpanNotQueryParser extends BaseQueryParser<SpanNotQueryBuilder> {
 
-    @Inject
-    public SpanNotQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{SpanNotQueryBuilder.NAME, Strings.toCamelCase(SpanNotQueryBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java
index 824b474228e..5e309d744a0 100644
--- a/core/src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java
@@ -30,10 +30,6 @@ import java.io.IOException;
  */
 public class SpanTermQueryParser extends BaseQueryParser<SpanTermQueryBuilder> {
 
-    @Inject
-    public SpanTermQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{SpanTermQueryBuilder.NAME, Strings.toCamelCase(SpanTermQueryBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanWithinQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanWithinQueryParser.java
index 00ddb0ef71e..1645db58325 100644
--- a/core/src/main/java/org/elasticsearch/index/query/SpanWithinQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/SpanWithinQueryParser.java
@@ -30,10 +30,6 @@ import java.io.IOException;
  */
 public class SpanWithinQueryParser extends BaseQueryParser<SpanWithinQueryBuilder> {
 
-    @Inject
-    public SpanWithinQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{SpanWithinQueryBuilder.NAME, Strings.toCamelCase(SpanWithinQueryBuilder.NAME)};
diff --git a/core/src/main/java/org/elasticsearch/index/query/TermQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/TermQueryParser.java
index 43d4d95c482..d5262958edf 100644
--- a/core/src/main/java/org/elasticsearch/index/query/TermQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/TermQueryParser.java
@@ -33,10 +33,6 @@ public class TermQueryParser extends BaseQueryParser<TermQueryBuilder> {
     private static final ParseField NAME_FIELD = new ParseField("_name").withAllDeprecated("query name is not supported in short version of term query");
     private static final ParseField BOOST_FIELD = new ParseField("boost").withAllDeprecated("boost is not supported in short version of term query");
 
-    @Inject
-    public TermQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{TermQueryBuilder.NAME};
diff --git a/core/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java
index b1f949c1868..31486a1fc5b 100644
--- a/core/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java
@@ -43,10 +43,6 @@ public class TermsQueryParser extends BaseQueryParser {
     private static final ParseField DISABLE_COORD_FIELD = new ParseField("disable_coord").withAllDeprecated("Use [bool] query instead");
     private static final ParseField EXECUTION_FIELD = new ParseField("execution").withAllDeprecated("execution is deprecated and has no effect");
 
-    @Inject
-    public TermsQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{TermsQueryBuilder.NAME, "in"};
diff --git a/core/src/main/java/org/elasticsearch/index/query/TypeQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/TypeQueryParser.java
index ee5e772c6af..05745a06372 100644
--- a/core/src/main/java/org/elasticsearch/index/query/TypeQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/TypeQueryParser.java
@@ -30,10 +30,6 @@ import java.io.IOException;
  */
 public class TypeQueryParser extends BaseQueryParser<TypeQueryBuilder> {
 
-    @Inject
-    public TypeQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{TypeQueryBuilder.NAME};
diff --git a/core/src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java
index d3b3e26df22..a26a98997c3 100644
--- a/core/src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java
@@ -29,10 +29,6 @@ import java.io.IOException;
  */
 public class WildcardQueryParser extends BaseQueryParser<WildcardQueryBuilder> {
 
-    @Inject
-    public WildcardQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{WildcardQueryBuilder.NAME};
diff --git a/core/src/main/java/org/elasticsearch/index/query/WrapperQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/WrapperQueryParser.java
index cd9eb83bdd9..20fbfa3eadd 100644
--- a/core/src/main/java/org/elasticsearch/index/query/WrapperQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/WrapperQueryParser.java
@@ -29,10 +29,6 @@ import java.io.IOException;
  */
 public class WrapperQueryParser extends BaseQueryParser {
 
-    @Inject
-    public WrapperQueryParser() {
-    }
-
     @Override
     public String[] names() {
         return new String[]{WrapperQueryBuilder.NAME};