diff --git a/src/Connections/Elasticsearch.Net.Connection.Thrift/ThriftConnection.cs b/src/Connections/Elasticsearch.Net.Connection.Thrift/ThriftConnection.cs
index 77ff26a846b..1af17bb85ed 100644
--- a/src/Connections/Elasticsearch.Net.Connection.Thrift/ThriftConnection.cs
+++ b/src/Connections/Elasticsearch.Net.Connection.Thrift/ThriftConnection.cs
@@ -1,19 +1,15 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Net.Sockets;
-using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Elasticsearch.Net.Connection.Configuration;
 using Elasticsearch.Net.Connection.Thrift.Protocol;
 using Elasticsearch.Net.Connection.Thrift.Transport;
-using Elasticsearch.Net.ConnectionPool;
-using Elasticsearch.Net.Providers;
 
 namespace Elasticsearch.Net.Connection.Thrift
 {
diff --git a/src/Nest/ConvenienceExtensions/AliasExtensions.cs b/src/Nest/ConvenienceExtensions/AliasExtensions.cs
index e40d126b16d..c560921ec88 100644
--- a/src/Nest/ConvenienceExtensions/AliasExtensions.cs
+++ b/src/Nest/ConvenienceExtensions/AliasExtensions.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/src/Nest/ConvenienceExtensions/DeleteExtensions.cs b/src/Nest/ConvenienceExtensions/DeleteExtensions.cs
index 477fbc58c06..9eaacabb261 100644
--- a/src/Nest/ConvenienceExtensions/DeleteExtensions.cs
+++ b/src/Nest/ConvenienceExtensions/DeleteExtensions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/ConvenienceExtensions/DeleteManyExtensions.cs b/src/Nest/ConvenienceExtensions/DeleteManyExtensions.cs
index 7142dfa153f..83ccfad2de7 100644
--- a/src/Nest/ConvenienceExtensions/DeleteManyExtensions.cs
+++ b/src/Nest/ConvenienceExtensions/DeleteManyExtensions.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 
diff --git a/src/Nest/ConvenienceExtensions/IndexManyExtensions.cs b/src/Nest/ConvenienceExtensions/IndexManyExtensions.cs
index 41afddb4248..3338eb45901 100644
--- a/src/Nest/ConvenienceExtensions/IndexManyExtensions.cs
+++ b/src/Nest/ConvenienceExtensions/IndexManyExtensions.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 
diff --git a/src/Nest/ConvenienceExtensions/SerializerExtensions.cs b/src/Nest/ConvenienceExtensions/SerializerExtensions.cs
index 74be7e0e797..c3cd95931c2 100644
--- a/src/Nest/ConvenienceExtensions/SerializerExtensions.cs
+++ b/src/Nest/ConvenienceExtensions/SerializerExtensions.cs
@@ -3,7 +3,6 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using Elasticsearch.Net.Serialization;
 
 namespace Nest.SerializationExtensions
 {
diff --git a/src/Nest/DSL/Aggregations/AggregationDescriptor.cs b/src/Nest/DSL/Aggregations/AggregationDescriptor.cs
index 8086415f17b..e53c805623e 100644
--- a/src/Nest/DSL/Aggregations/AggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/AggregationDescriptor.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
-using Elasticsearch.Net;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/AverageAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/AverageAggregationDescriptor.cs
index 48476f51d8b..9eaf28323f7 100644
--- a/src/Nest/DSL/Aggregations/AverageAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/AverageAggregationDescriptor.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/BucketAggregationBaseDescriptor.cs b/src/Nest/DSL/Aggregations/BucketAggregationBaseDescriptor.cs
index fccfc2237de..5c972048525 100644
--- a/src/Nest/DSL/Aggregations/BucketAggregationBaseDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/BucketAggregationBaseDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Nest.Resolvers;
-using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Aggregations/CardinalityAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/CardinalityAggregationDescriptor.cs
index 7c8ddb03a1d..d13ba53fe96 100644
--- a/src/Nest/DSL/Aggregations/CardinalityAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/CardinalityAggregationDescriptor.cs
@@ -1,10 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Net.Configuration;
-using System.Text;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/DateHistogramAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/DateHistogramAggregationDescriptor.cs
index fb7e8eb729b..c96e6a88ba3 100644
--- a/src/Nest/DSL/Aggregations/DateHistogramAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/DateHistogramAggregationDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/DateRangeAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/DateRangeAggregationDescriptor.cs
index 546eff0e559..39dd88b46f8 100644
--- a/src/Nest/DSL/Aggregations/DateRangeAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/DateRangeAggregationDescriptor.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/FilterAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/FilterAggregationDescriptor.cs
index 3a6c6599429..dc14219a609 100644
--- a/src/Nest/DSL/Aggregations/FilterAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/FilterAggregationDescriptor.cs
@@ -1,5 +1,4 @@
 using System;
-using Nest.Resolvers.Converters;
 using Nest.Resolvers.Converters.Aggregations;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/GeoDistanceAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/GeoDistanceAggregationDescriptor.cs
index c3a5f9e8eae..35649809172 100644
--- a/src/Nest/DSL/Aggregations/GeoDistanceAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/GeoDistanceAggregationDescriptor.cs
@@ -3,10 +3,8 @@
 using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Aggregations/GeoHashAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/GeoHashAggregationDescriptor.cs
index 44cecdb04f3..96d51a95bf6 100644
--- a/src/Nest/DSL/Aggregations/GeoHashAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/GeoHashAggregationDescriptor.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/HistogramAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/HistogramAggregationDescriptor.cs
index 70af8fbee63..4b39ecfeeb8 100644
--- a/src/Nest/DSL/Aggregations/HistogramAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/HistogramAggregationDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/Ip4RangeAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/Ip4RangeAggregationDescriptor.cs
index ffea3c68ad3..b8812cf72fc 100644
--- a/src/Nest/DSL/Aggregations/Ip4RangeAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/Ip4RangeAggregationDescriptor.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/MaxAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/MaxAggregationDescriptor.cs
index ad3fed94d17..7696805fa6f 100644
--- a/src/Nest/DSL/Aggregations/MaxAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/MaxAggregationDescriptor.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/MetricAggregationBaseDescriptor.cs b/src/Nest/DSL/Aggregations/MetricAggregationBaseDescriptor.cs
index c00235945f8..0cfe1dd815b 100644
--- a/src/Nest/DSL/Aggregations/MetricAggregationBaseDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/MetricAggregationBaseDescriptor.cs
@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/Aggregations/MinAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/MinAggregationDescriptor.cs
index 44bc4aefcb6..f8b962cb6fe 100644
--- a/src/Nest/DSL/Aggregations/MinAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/MinAggregationDescriptor.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/MissingAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/MissingAggregationDescriptor.cs
index 1a9ce9a4c52..feecc1cd55e 100644
--- a/src/Nest/DSL/Aggregations/MissingAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/MissingAggregationDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/NestedAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/NestedAggregationDescriptor.cs
index 72d4d01a5cf..cc44d0967e4 100644
--- a/src/Nest/DSL/Aggregations/NestedAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/NestedAggregationDescriptor.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/PercentilesAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/PercentilesAggregationDescriptor.cs
index 8db121d9c6b..34e24f8cbff 100644
--- a/src/Nest/DSL/Aggregations/PercentilesAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/PercentilesAggregationDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/RangeAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/RangeAggregationDescriptor.cs
index b5e87f5030a..b65cc9ad851 100644
--- a/src/Nest/DSL/Aggregations/RangeAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/RangeAggregationDescriptor.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/SignificantTermsAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/SignificantTermsAggregationDescriptor.cs
index 97775ded64f..ebbe03e276d 100644
--- a/src/Nest/DSL/Aggregations/SignificantTermsAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/SignificantTermsAggregationDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/StatsAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/StatsAggregationDescriptor.cs
index 1950b530449..8cb8ccbc4bd 100644
--- a/src/Nest/DSL/Aggregations/StatsAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/StatsAggregationDescriptor.cs
@@ -1,10 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Text.RegularExpressions;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/SumAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/SumAggregationDescriptor.cs
index 44c9f0569cc..372755715bc 100644
--- a/src/Nest/DSL/Aggregations/SumAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/SumAggregationDescriptor.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/TermsAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/TermsAggregationDescriptor.cs
index 9a54d05b9d5..1ebab5dd599 100644
--- a/src/Nest/DSL/Aggregations/TermsAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/TermsAggregationDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Aggregations/ValueCountAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/ValueCountAggregationDescriptor.cs
index b7723f315a7..d9bec23ba55 100644
--- a/src/Nest/DSL/Aggregations/ValueCountAggregationDescriptor.cs
+++ b/src/Nest/DSL/Aggregations/ValueCountAggregationDescriptor.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/AliasDescriptor.cs b/src/Nest/DSL/AliasDescriptor.cs
index 08b1c3a9d48..27b157846c1 100644
--- a/src/Nest/DSL/AliasDescriptor.cs
+++ b/src/Nest/DSL/AliasDescriptor.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
-using Nest;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/AnalyzeDescriptor.cs b/src/Nest/DSL/AnalyzeDescriptor.cs
index 6e386d5b9cd..210e7992a75 100644
--- a/src/Nest/DSL/AnalyzeDescriptor.cs
+++ b/src/Nest/DSL/AnalyzeDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Bulk/BulkDeleteDescriptor.cs b/src/Nest/DSL/Bulk/BulkDeleteDescriptor.cs
index 9580087b994..a46b579754b 100644
--- a/src/Nest/DSL/Bulk/BulkDeleteDescriptor.cs
+++ b/src/Nest/DSL/Bulk/BulkDeleteDescriptor.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using Nest.Resolvers;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Bulk/BulkIndexDescriptor.cs b/src/Nest/DSL/Bulk/BulkIndexDescriptor.cs
index 4249449a247..144ad71dd2c 100644
--- a/src/Nest/DSL/Bulk/BulkIndexDescriptor.cs
+++ b/src/Nest/DSL/Bulk/BulkIndexDescriptor.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 using Elasticsearch.Net;
 
diff --git a/src/Nest/DSL/Bulk/BulkUpdateDescriptor.cs b/src/Nest/DSL/Bulk/BulkUpdateDescriptor.cs
index aa67863067a..a38408fbd04 100644
--- a/src/Nest/DSL/Bulk/BulkUpdateDescriptor.cs
+++ b/src/Nest/DSL/Bulk/BulkUpdateDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Security.Cryptography.X509Certificates;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/BulkDescriptor.cs b/src/Nest/DSL/BulkDescriptor.cs
index af87d5425ee..9dd8f5bed79 100644
--- a/src/Nest/DSL/BulkDescriptor.cs
+++ b/src/Nest/DSL/BulkDescriptor.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/ClearCacheDescriptor.cs b/src/Nest/DSL/ClearCacheDescriptor.cs
index 68f3e97d253..3f48c1e17a5 100644
--- a/src/Nest/DSL/ClearCacheDescriptor.cs
+++ b/src/Nest/DSL/ClearCacheDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/ClearScrollDescriptor.cs b/src/Nest/DSL/ClearScrollDescriptor.cs
index 4564de6b164..bf33639084d 100644
--- a/src/Nest/DSL/ClearScrollDescriptor.cs
+++ b/src/Nest/DSL/ClearScrollDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/CloseIndexDescriptor.cs b/src/Nest/DSL/CloseIndexDescriptor.cs
index 48ca365509a..36dc3e05e5f 100644
--- a/src/Nest/DSL/CloseIndexDescriptor.cs
+++ b/src/Nest/DSL/CloseIndexDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/ClusterGetSettingsDescriptor.cs b/src/Nest/DSL/ClusterGetSettingsDescriptor.cs
index a4cd3f98b49..4fc8aa61e72 100644
--- a/src/Nest/DSL/ClusterGetSettingsDescriptor.cs
+++ b/src/Nest/DSL/ClusterGetSettingsDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/ClusterHealthDescriptor.cs b/src/Nest/DSL/ClusterHealthDescriptor.cs
index aa6a9c216c9..9b5d16a11c3 100644
--- a/src/Nest/DSL/ClusterHealthDescriptor.cs
+++ b/src/Nest/DSL/ClusterHealthDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/ClusterSettingsDescriptor.cs b/src/Nest/DSL/ClusterSettingsDescriptor.cs
index 93a34a8ed22..bf110e8f4c1 100644
--- a/src/Nest/DSL/ClusterSettingsDescriptor.cs
+++ b/src/Nest/DSL/ClusterSettingsDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/ClusterStateDescriptor.cs b/src/Nest/DSL/ClusterStateDescriptor.cs
index 8bc20c9ecd6..ac75066a647 100644
--- a/src/Nest/DSL/ClusterStateDescriptor.cs
+++ b/src/Nest/DSL/ClusterStateDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Common/BasePathDescriptor.cs b/src/Nest/DSL/Common/BasePathDescriptor.cs
index 1786d9b7a86..24171ec16c9 100644
--- a/src/Nest/DSL/Common/BasePathDescriptor.cs
+++ b/src/Nest/DSL/Common/BasePathDescriptor.cs
@@ -1,6 +1,5 @@
 using System;
 using Elasticsearch.Net;
-using Elasticsearch.Net.Connection;
 using Elasticsearch.Net.Connection.Configuration;
 
 namespace Nest
diff --git a/src/Nest/DSL/CountDescriptor.cs b/src/Nest/DSL/CountDescriptor.cs
index 641da73f585..19949b9b83b 100644
--- a/src/Nest/DSL/CountDescriptor.cs
+++ b/src/Nest/DSL/CountDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
-using Nest.Resolvers.Converters;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/CreateIndexDescriptor.cs b/src/Nest/DSL/CreateIndexDescriptor.cs
index 24ee8b128c7..a4eaabe4712 100644
--- a/src/Nest/DSL/CreateIndexDescriptor.cs
+++ b/src/Nest/DSL/CreateIndexDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/CreateRepositoryDescriptor.cs b/src/Nest/DSL/CreateRepositoryDescriptor.cs
index f846533b68b..833ee437f40 100644
--- a/src/Nest/DSL/CreateRepositoryDescriptor.cs
+++ b/src/Nest/DSL/CreateRepositoryDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/DeleteByQueryDescriptor.cs b/src/Nest/DSL/DeleteByQueryDescriptor.cs
index dc5445fc5e3..51f62060df1 100644
--- a/src/Nest/DSL/DeleteByQueryDescriptor.cs
+++ b/src/Nest/DSL/DeleteByQueryDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/DeleteDescriptor.cs b/src/Nest/DSL/DeleteDescriptor.cs
index 3ef0a1c4a95..badca82bf7b 100644
--- a/src/Nest/DSL/DeleteDescriptor.cs
+++ b/src/Nest/DSL/DeleteDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/DeleteIndexDescriptor.cs b/src/Nest/DSL/DeleteIndexDescriptor.cs
index c8c5c83c409..f1925c545ba 100644
--- a/src/Nest/DSL/DeleteIndexDescriptor.cs
+++ b/src/Nest/DSL/DeleteIndexDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/DeleteMappingDescriptor.cs b/src/Nest/DSL/DeleteMappingDescriptor.cs
index 25be8c8a00f..cbd9dd91461 100644
--- a/src/Nest/DSL/DeleteMappingDescriptor.cs
+++ b/src/Nest/DSL/DeleteMappingDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/DeleteRepositoryDescriptor.cs b/src/Nest/DSL/DeleteRepositoryDescriptor.cs
index b16154c2409..76cd925ce34 100644
--- a/src/Nest/DSL/DeleteRepositoryDescriptor.cs
+++ b/src/Nest/DSL/DeleteRepositoryDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/DeleteSnapshotDescriptor.cs b/src/Nest/DSL/DeleteSnapshotDescriptor.cs
index 43cd3559e82..45c0f0e19b2 100644
--- a/src/Nest/DSL/DeleteSnapshotDescriptor.cs
+++ b/src/Nest/DSL/DeleteSnapshotDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/DeleteTemplateDescriptor.cs b/src/Nest/DSL/DeleteTemplateDescriptor.cs
index a6188326888..93525cde09e 100644
--- a/src/Nest/DSL/DeleteTemplateDescriptor.cs
+++ b/src/Nest/DSL/DeleteTemplateDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/DeleteWarmerDescriptor.cs b/src/Nest/DSL/DeleteWarmerDescriptor.cs
index c9c7c00e36f..8c77e6e7bdc 100644
--- a/src/Nest/DSL/DeleteWarmerDescriptor.cs
+++ b/src/Nest/DSL/DeleteWarmerDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/DocumentExistsDescriptor.cs b/src/Nest/DSL/DocumentExistsDescriptor.cs
index 4af475dc52c..6fcccbc07be 100644
--- a/src/Nest/DSL/DocumentExistsDescriptor.cs
+++ b/src/Nest/DSL/DocumentExistsDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Facets/BaseFacetDescriptor.cs b/src/Nest/DSL/Facets/BaseFacetDescriptor.cs
index d70cf6deaee..23984ecc784 100644
--- a/src/Nest/DSL/Facets/BaseFacetDescriptor.cs
+++ b/src/Nest/DSL/Facets/BaseFacetDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.Resolvers;
 using System.Linq.Expressions;
 
 namespace Nest
diff --git a/src/Nest/DSL/Facets/DateHistogramFacetDescriptor.cs b/src/Nest/DSL/Facets/DateHistogramFacetDescriptor.cs
index bd767e52dc1..36ee7781152 100644
--- a/src/Nest/DSL/Facets/DateHistogramFacetDescriptor.cs
+++ b/src/Nest/DSL/Facets/DateHistogramFacetDescriptor.cs
@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using System.Linq.Expressions;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Facets/DateInterval.cs b/src/Nest/DSL/Facets/DateInterval.cs
index ef37c3fc34e..2543a04abc2 100644
--- a/src/Nest/DSL/Facets/DateInterval.cs
+++ b/src/Nest/DSL/Facets/DateInterval.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
diff --git a/src/Nest/DSL/Facets/DateRounding.cs b/src/Nest/DSL/Facets/DateRounding.cs
index 6cdb1d0c155..9d04c333755 100644
--- a/src/Nest/DSL/Facets/DateRounding.cs
+++ b/src/Nest/DSL/Facets/DateRounding.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
diff --git a/src/Nest/DSL/Facets/FacetContainer.cs b/src/Nest/DSL/Facets/FacetContainer.cs
index 07e950a354d..cfff5511885 100644
--- a/src/Nest/DSL/Facets/FacetContainer.cs
+++ b/src/Nest/DSL/Facets/FacetContainer.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.Linq.Expressions;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Facets/FacetRequest.cs b/src/Nest/DSL/Facets/FacetRequest.cs
index 661a84ae1d8..a82e550a4cd 100644
--- a/src/Nest/DSL/Facets/FacetRequest.cs
+++ b/src/Nest/DSL/Facets/FacetRequest.cs
@@ -1,5 +1,3 @@
-using Nest.Resolvers;
-
 namespace Nest
 {
 	public interface IFacetRequest
diff --git a/src/Nest/DSL/Facets/GeoDistanceFacetDescriptor.cs b/src/Nest/DSL/Facets/GeoDistanceFacetDescriptor.cs
index 647f86d485a..a081d59776a 100644
--- a/src/Nest/DSL/Facets/GeoDistanceFacetDescriptor.cs
+++ b/src/Nest/DSL/Facets/GeoDistanceFacetDescriptor.cs
@@ -1,14 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using System.Linq.Expressions;
-using Elasticsearch.Net;
 using System.Globalization;
-using Nest.Resolvers;
-using System.Runtime.Serialization;
 using Nest.Resolvers.Converters;
 
 namespace Nest
diff --git a/src/Nest/DSL/Facets/HistogramFacetDescriptor.cs b/src/Nest/DSL/Facets/HistogramFacetDescriptor.cs
index f6fe40b0268..aa902eb95c2 100644
--- a/src/Nest/DSL/Facets/HistogramFacetDescriptor.cs
+++ b/src/Nest/DSL/Facets/HistogramFacetDescriptor.cs
@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using System.Linq.Expressions;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Facets/Range.cs b/src/Nest/DSL/Facets/Range.cs
index f12ae741966..af71c45bfa1 100644
--- a/src/Nest/DSL/Facets/Range.cs
+++ b/src/Nest/DSL/Facets/Range.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/Facets/RangeFacetDescriptor.cs b/src/Nest/DSL/Facets/RangeFacetDescriptor.cs
index f7c5cb358dc..bde025e57df 100644
--- a/src/Nest/DSL/Facets/RangeFacetDescriptor.cs
+++ b/src/Nest/DSL/Facets/RangeFacetDescriptor.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using System.Linq.Expressions;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Facets/StatisticalFacetDescriptor.cs b/src/Nest/DSL/Facets/StatisticalFacetDescriptor.cs
index 8b33d89bcd4..2ad6b810fca 100644
--- a/src/Nest/DSL/Facets/StatisticalFacetDescriptor.cs
+++ b/src/Nest/DSL/Facets/StatisticalFacetDescriptor.cs
@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using System.Linq.Expressions;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Facets/TermFacetDescriptor.cs b/src/Nest/DSL/Facets/TermFacetDescriptor.cs
index 26c551eb813..8102b1e7244 100644
--- a/src/Nest/DSL/Facets/TermFacetDescriptor.cs
+++ b/src/Nest/DSL/Facets/TermFacetDescriptor.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Facets/TermsOrder.cs b/src/Nest/DSL/Facets/TermsOrder.cs
index 2b1e44e183a..3cfb8f4d94d 100644
--- a/src/Nest/DSL/Facets/TermsOrder.cs
+++ b/src/Nest/DSL/Facets/TermsOrder.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
diff --git a/src/Nest/DSL/Facets/TermsStatsFacetDescriptor.cs b/src/Nest/DSL/Facets/TermsStatsFacetDescriptor.cs
index 212c77f6441..79d00be2c97 100644
--- a/src/Nest/DSL/Facets/TermsStatsFacetDescriptor.cs
+++ b/src/Nest/DSL/Facets/TermsStatsFacetDescriptor.cs
@@ -1,13 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using System.Linq.Expressions;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Facets/TermsStatsOrder.cs b/src/Nest/DSL/Facets/TermsStatsOrder.cs
index 3a2d5ee4769..3020281aab7 100644
--- a/src/Nest/DSL/Facets/TermsStatsOrder.cs
+++ b/src/Nest/DSL/Facets/TermsStatsOrder.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.Linq.Expressions;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/AndFilterDescriptor.cs b/src/Nest/DSL/Filter/AndFilterDescriptor.cs
index 5708a3102be..aca66d93b90 100644
--- a/src/Nest/DSL/Filter/AndFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/AndFilterDescriptor.cs
@@ -1,14 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Linq.Expressions;
-using Nest.Resolvers;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
 using Newtonsoft.Json;
 using Nest.Resolvers.Converters;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/BoolFilterDescriptor.cs b/src/Nest/DSL/Filter/BoolFilterDescriptor.cs
index 40e14f8fef3..7ce7445d6e0 100644
--- a/src/Nest/DSL/Filter/BoolFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/BoolFilterDescriptor.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using System.Linq.Expressions;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/ConditionlessFilterDescriptor.cs b/src/Nest/DSL/Filter/ConditionlessFilterDescriptor.cs
index 580d19fd31f..0f605ecc0f4 100644
--- a/src/Nest/DSL/Filter/ConditionlessFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/ConditionlessFilterDescriptor.cs
@@ -1,10 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.Resolvers.Converters;
-using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/ExistsFilterDescriptor.cs b/src/Nest/DSL/Filter/ExistsFilterDescriptor.cs
index f4d1f920c82..eae4d764a08 100644
--- a/src/Nest/DSL/Filter/ExistsFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/ExistsFilterDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Filter/FilterBase.cs b/src/Nest/DSL/Filter/FilterBase.cs
index 5b35de3d4b9..3e039851231 100644
--- a/src/Nest/DSL/Filter/FilterBase.cs
+++ b/src/Nest/DSL/Filter/FilterBase.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/Filter/FilterContainer.cs b/src/Nest/DSL/Filter/FilterContainer.cs
index a3694725d25..5556dd74032 100644
--- a/src/Nest/DSL/Filter/FilterContainer.cs
+++ b/src/Nest/DSL/Filter/FilterContainer.cs
@@ -1,14 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
 using Nest.DSL.Visitor;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
-using Elasticsearch.Net;
-using System.Linq.Expressions;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/FilterDescriptor.cs b/src/Nest/DSL/Filter/FilterDescriptor.cs
index 9980547ab7d..7d9df14818c 100644
--- a/src/Nest/DSL/Filter/FilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/FilterDescriptor.cs
@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
 using System.Globalization;
-using Elasticsearch.Net;
-using Nest.Resolvers;
-using System.Collections;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/GeoBoundingBoxFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoBoundingBoxFilterDescriptor.cs
index fa734778bc6..69ea4d4a50f 100644
--- a/src/Nest/DSL/Filter/GeoBoundingBoxFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/GeoBoundingBoxFilterDescriptor.cs
@@ -1,13 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
-using Nest.Resolvers.Converters.Filters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
-using Newtonsoft.Json.Converters;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/GeoDistanceFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoDistanceFilterDescriptor.cs
index 2cb15a9bc20..a63052e43be 100644
--- a/src/Nest/DSL/Filter/GeoDistanceFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/GeoDistanceFilterDescriptor.cs
@@ -1,10 +1,6 @@
 //using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
-using Nest.Resolvers.Converters.Filters;
 using Newtonsoft.Json;
 using System.Globalization;
 using System;
diff --git a/src/Nest/DSL/Filter/GeoDistanceRangeFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoDistanceRangeFilterDescriptor.cs
index 89e28eabd26..2e8783d8fa8 100644
--- a/src/Nest/DSL/Filter/GeoDistanceRangeFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/GeoDistanceRangeFilterDescriptor.cs
@@ -1,13 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
-using Nest.Resolvers.Converters.Filters;
 using Newtonsoft.Json;
 using System.Globalization;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/GeoIndexedShapeFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoIndexedShapeFilterDescriptor.cs
index 6f8dbc9644a..a84385e2aae 100644
--- a/src/Nest/DSL/Filter/GeoIndexedShapeFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/GeoIndexedShapeFilterDescriptor.cs
@@ -2,12 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
-using Nest.Resolvers.Converters.Filters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/GeoPolygonFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoPolygonFilterDescriptor.cs
index 00bdd18d83e..f64e446db0f 100644
--- a/src/Nest/DSL/Filter/GeoPolygonFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/GeoPolygonFilterDescriptor.cs
@@ -1,12 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
-using Nest.Resolvers.Converters.Filters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/GeoShapeFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoShapeFilterDescriptor.cs
index c99e0062956..d6ae8d73226 100644
--- a/src/Nest/DSL/Filter/GeoShapeFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/GeoShapeFilterDescriptor.cs
@@ -1,12 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
-using Nest.Resolvers.Converters.Filters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/HasChildFilterDescriptor.cs b/src/Nest/DSL/Filter/HasChildFilterDescriptor.cs
index 9e56e21f525..551442d13be 100644
--- a/src/Nest/DSL/Filter/HasChildFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/HasChildFilterDescriptor.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using System.Linq.Expressions;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/HasParentFilterDescriptor.cs b/src/Nest/DSL/Filter/HasParentFilterDescriptor.cs
index edef6bad47d..6f1a22eb1bd 100644
--- a/src/Nest/DSL/Filter/HasParentFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/HasParentFilterDescriptor.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using System.Linq.Expressions;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/IFieldNameFilter.cs b/src/Nest/DSL/Filter/IFieldNameFilter.cs
index ce25ca470b6..4bbad55671e 100644
--- a/src/Nest/DSL/Filter/IFieldNameFilter.cs
+++ b/src/Nest/DSL/Filter/IFieldNameFilter.cs
@@ -1,5 +1,3 @@
-using Nest.Resolvers;
-
 namespace Nest
 {
 	public interface IFieldNameFilter : IFilter
diff --git a/src/Nest/DSL/Filter/IFilterContainer.cs b/src/Nest/DSL/Filter/IFilterContainer.cs
index d40472c26c4..dc34fea07aa 100644
--- a/src/Nest/DSL/Filter/IFilterContainer.cs
+++ b/src/Nest/DSL/Filter/IFilterContainer.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq.Expressions;
 using Nest.DSL.Visitor;
 using Nest.Resolvers.Converters;
 using Nest.Resolvers.Converters.Filters;
diff --git a/src/Nest/DSL/Filter/INotFilter.cs b/src/Nest/DSL/Filter/INotFilter.cs
index 541f37b94ee..ee77bf9177c 100644
--- a/src/Nest/DSL/Filter/INotFilter.cs
+++ b/src/Nest/DSL/Filter/INotFilter.cs
@@ -1,13 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Linq.Expressions;
-using Nest.Resolvers;
-using Newtonsoft.Json.Serialization;
 using Newtonsoft.Json;
 using Nest.Resolvers.Converters;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/IdsFilterDescriptor.cs b/src/Nest/DSL/Filter/IdsFilterDescriptor.cs
index a57c9832d0f..f1922b67ee6 100644
--- a/src/Nest/DSL/Filter/IdsFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/IdsFilterDescriptor.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/LimitFilterDescriptor.cs b/src/Nest/DSL/Filter/LimitFilterDescriptor.cs
index edc5c71ebe8..ba1a983b69a 100644
--- a/src/Nest/DSL/Filter/LimitFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/LimitFilterDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Filter/MatchAllFilterDescriptor.cs b/src/Nest/DSL/Filter/MatchAllFilterDescriptor.cs
index 27d227a4df1..c9126ad7455 100644
--- a/src/Nest/DSL/Filter/MatchAllFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/MatchAllFilterDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Filter/MissingFilterDescriptor.cs b/src/Nest/DSL/Filter/MissingFilterDescriptor.cs
index f2331c7a245..35dfa4899d2 100644
--- a/src/Nest/DSL/Filter/MissingFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/MissingFilterDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Filter/NestedFilterDescriptor.cs b/src/Nest/DSL/Filter/NestedFilterDescriptor.cs
index 1ef3450be0c..03fd69d5471 100644
--- a/src/Nest/DSL/Filter/NestedFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/NestedFilterDescriptor.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
 using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/OrFilterDescriptor.cs b/src/Nest/DSL/Filter/OrFilterDescriptor.cs
index 9b477d53746..85de8f6a12f 100644
--- a/src/Nest/DSL/Filter/OrFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/OrFilterDescriptor.cs
@@ -1,13 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Linq.Expressions;
-using Nest.Resolvers;
-using Newtonsoft.Json.Serialization;
 using Newtonsoft.Json;
 using Nest.Resolvers.Converters;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/PrefixFilterDescriptor.cs b/src/Nest/DSL/Filter/PrefixFilterDescriptor.cs
index d45d2622bce..6f493a7c234 100644
--- a/src/Nest/DSL/Filter/PrefixFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/PrefixFilterDescriptor.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Linq;
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/Filter/QueryFilterDescriptor.cs b/src/Nest/DSL/Filter/QueryFilterDescriptor.cs
index 2d9f36254df..2d746e1cc33 100644
--- a/src/Nest/DSL/Filter/QueryFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/QueryFilterDescriptor.cs
@@ -1,13 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Linq.Expressions;
-using Nest.Resolvers;
-using Newtonsoft.Json.Serialization;
 using Newtonsoft.Json;
 using Nest.Resolvers.Converters;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/RangeFilterDescriptor.cs b/src/Nest/DSL/Filter/RangeFilterDescriptor.cs
index c30154b19d5..73fd87c67c3 100644
--- a/src/Nest/DSL/Filter/RangeFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/RangeFilterDescriptor.cs
@@ -2,14 +2,9 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
 using Nest.Resolvers.Converters;
-using Nest.Resolvers.Converters.Filters;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/RawFilter.cs b/src/Nest/DSL/Filter/RawFilter.cs
index b0204404bb8..84d027db4ce 100644
--- a/src/Nest/DSL/Filter/RawFilter.cs
+++ b/src/Nest/DSL/Filter/RawFilter.cs
@@ -1,10 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Linq.Expressions;
-using Nest.Resolvers;
-using Newtonsoft.Json.Serialization;
 using Newtonsoft.Json;
 using Nest.Resolvers.Converters;
 
diff --git a/src/Nest/DSL/Filter/RegexpFilterDescriptor.cs b/src/Nest/DSL/Filter/RegexpFilterDescriptor.cs
index c49235d722c..0d256d4d573 100644
--- a/src/Nest/DSL/Filter/RegexpFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/RegexpFilterDescriptor.cs
@@ -1,14 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.Resolvers.Converters;
-using Nest.Resolvers.Converters.Filters;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/ScriptFilterDescriptor.cs b/src/Nest/DSL/Filter/ScriptFilterDescriptor.cs
index 189529937a5..9da51640b17 100644
--- a/src/Nest/DSL/Filter/ScriptFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/ScriptFilterDescriptor.cs
@@ -2,11 +2,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
-using Newtonsoft.Json.Converters;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/TermFilterDescriptor.cs b/src/Nest/DSL/Filter/TermFilterDescriptor.cs
index 71ea7d95233..27adb60fa9a 100644
--- a/src/Nest/DSL/Filter/TermFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/TermFilterDescriptor.cs
@@ -1,13 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Linq.Expressions;
-using Nest.Resolvers;
-using Newtonsoft.Json.Serialization;
 using Newtonsoft.Json;
-using Nest.Resolvers.Converters;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/TermsFilterDescriptor.cs b/src/Nest/DSL/Filter/TermsFilterDescriptor.cs
index cd2e9a6bb54..7928313580e 100644
--- a/src/Nest/DSL/Filter/TermsFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/TermsFilterDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
 using Nest.Resolvers.Converters.Filters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Filter/TermsLookupFilterDescriptor.cs b/src/Nest/DSL/Filter/TermsLookupFilterDescriptor.cs
index b5e450b4f29..c65abc3563a 100644
--- a/src/Nest/DSL/Filter/TermsLookupFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/TermsLookupFilterDescriptor.cs
@@ -2,12 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
-using Nest.Resolvers.Converters.Filters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Filter/TypeFilterDescriptor.cs b/src/Nest/DSL/Filter/TypeFilterDescriptor.cs
index a1d5561f4f6..6fc7ca5c1fe 100644
--- a/src/Nest/DSL/Filter/TypeFilterDescriptor.cs
+++ b/src/Nest/DSL/Filter/TypeFilterDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/FlushDescriptor.cs b/src/Nest/DSL/FlushDescriptor.cs
index 1514457d05f..4879f98f081 100644
--- a/src/Nest/DSL/FlushDescriptor.cs
+++ b/src/Nest/DSL/FlushDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/GetAliasDescriptor.cs b/src/Nest/DSL/GetAliasDescriptor.cs
index 54f0eba3409..6c146c07402 100644
--- a/src/Nest/DSL/GetAliasDescriptor.cs
+++ b/src/Nest/DSL/GetAliasDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/GetAliasesDescriptor.cs b/src/Nest/DSL/GetAliasesDescriptor.cs
index 4e47da1b8a3..6cb32e6791d 100644
--- a/src/Nest/DSL/GetAliasesDescriptor.cs
+++ b/src/Nest/DSL/GetAliasesDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/GetDescriptor.cs b/src/Nest/DSL/GetDescriptor.cs
index c1bc261dc1d..618ada26e46 100644
--- a/src/Nest/DSL/GetDescriptor.cs
+++ b/src/Nest/DSL/GetDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/GetIndexSettingsDescriptor.cs b/src/Nest/DSL/GetIndexSettingsDescriptor.cs
index ea3ff33339b..051a04a4598 100644
--- a/src/Nest/DSL/GetIndexSettingsDescriptor.cs
+++ b/src/Nest/DSL/GetIndexSettingsDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/GetMappingDescriptor.cs b/src/Nest/DSL/GetMappingDescriptor.cs
index 277c0136e56..2bb97e14dc3 100644
--- a/src/Nest/DSL/GetMappingDescriptor.cs
+++ b/src/Nest/DSL/GetMappingDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/GetSnapshotDescriptor.cs b/src/Nest/DSL/GetSnapshotDescriptor.cs
index 285ba0dbb86..362c227da97 100644
--- a/src/Nest/DSL/GetSnapshotDescriptor.cs
+++ b/src/Nest/DSL/GetSnapshotDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/GetTemplateDescriptor.cs b/src/Nest/DSL/GetTemplateDescriptor.cs
index f9a3593e94b..1a89c3fef8a 100644
--- a/src/Nest/DSL/GetTemplateDescriptor.cs
+++ b/src/Nest/DSL/GetTemplateDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/GetWarmerDescriptor.cs b/src/Nest/DSL/GetWarmerDescriptor.cs
index f7e8c1d8449..f1f946cabfd 100644
--- a/src/Nest/DSL/GetWarmerDescriptor.cs
+++ b/src/Nest/DSL/GetWarmerDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/IndexDescriptor.cs b/src/Nest/DSL/IndexDescriptor.cs
index ffada405e8c..f7346e8458b 100644
--- a/src/Nest/DSL/IndexDescriptor.cs
+++ b/src/Nest/DSL/IndexDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/IndexExistsDescriptor.cs b/src/Nest/DSL/IndexExistsDescriptor.cs
index a7fdc124041..a7954b798d0 100644
--- a/src/Nest/DSL/IndexExistsDescriptor.cs
+++ b/src/Nest/DSL/IndexExistsDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/IndicesStatsDescriptor.cs b/src/Nest/DSL/IndicesStatsDescriptor.cs
index 7af1c2bdd1f..607660b84b6 100644
--- a/src/Nest/DSL/IndicesStatsDescriptor.cs
+++ b/src/Nest/DSL/IndicesStatsDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/IndicesStatusDescriptor.cs b/src/Nest/DSL/IndicesStatusDescriptor.cs
index 1f21204b7d2..3947e8d7405 100644
--- a/src/Nest/DSL/IndicesStatusDescriptor.cs
+++ b/src/Nest/DSL/IndicesStatusDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/InfoDescriptor.cs b/src/Nest/DSL/InfoDescriptor.cs
index 513b32aa6a9..97cd275a63d 100644
--- a/src/Nest/DSL/InfoDescriptor.cs
+++ b/src/Nest/DSL/InfoDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Mapping/AnalysisDescriptor.cs b/src/Nest/DSL/Mapping/AnalysisDescriptor.cs
index 2debce3184d..c6bbe324aa9 100644
--- a/src/Nest/DSL/Mapping/AnalysisDescriptor.cs
+++ b/src/Nest/DSL/Mapping/AnalysisDescriptor.cs
@@ -1,13 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
-using Elasticsearch.Net;
-using System.Linq.Expressions;
-using Nest.Resolvers;
-using Nest.Domain;
-using Nest.DSL.Descriptors;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/MoreLikeThisDescriptor.cs b/src/Nest/DSL/MoreLikeThisDescriptor.cs
index cd3733792cd..4d0055a53cc 100644
--- a/src/Nest/DSL/MoreLikeThisDescriptor.cs
+++ b/src/Nest/DSL/MoreLikeThisDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/MultiGet/MultiGetDoc.cs b/src/Nest/DSL/MultiGet/MultiGetDoc.cs
index 92fae96502c..e5d0865a4c2 100644
--- a/src/Nest/DSL/MultiGet/MultiGetDoc.cs
+++ b/src/Nest/DSL/MultiGet/MultiGetDoc.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/MultiGetDescriptor.cs b/src/Nest/DSL/MultiGetDescriptor.cs
index 8e84cc98441..51735516981 100644
--- a/src/Nest/DSL/MultiGetDescriptor.cs
+++ b/src/Nest/DSL/MultiGetDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/MultiSearchDescriptor.cs b/src/Nest/DSL/MultiSearchDescriptor.cs
index a7bd82e4207..efc50b61297 100644
--- a/src/Nest/DSL/MultiSearchDescriptor.cs
+++ b/src/Nest/DSL/MultiSearchDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/MultiTermVectorsDescriptor.cs b/src/Nest/DSL/MultiTermVectorsDescriptor.cs
index 21889508d31..c50389b3b84 100644
--- a/src/Nest/DSL/MultiTermVectorsDescriptor.cs
+++ b/src/Nest/DSL/MultiTermVectorsDescriptor.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/NodesInfoDescriptor.cs b/src/Nest/DSL/NodesInfoDescriptor.cs
index acb8bf3ba10..ed71614d1d4 100644
--- a/src/Nest/DSL/NodesInfoDescriptor.cs
+++ b/src/Nest/DSL/NodesInfoDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/NodesStatsDescriptor.cs b/src/Nest/DSL/NodesStatsDescriptor.cs
index cd2365b5822..7ba8a4a220f 100644
--- a/src/Nest/DSL/NodesStatsDescriptor.cs
+++ b/src/Nest/DSL/NodesStatsDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/OpenIndexDescriptor.cs b/src/Nest/DSL/OpenIndexDescriptor.cs
index 99056c86e7c..575e16b76b3 100644
--- a/src/Nest/DSL/OpenIndexDescriptor.cs
+++ b/src/Nest/DSL/OpenIndexDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/OptimizeDescriptor.cs b/src/Nest/DSL/OptimizeDescriptor.cs
index 0ca5673dd3a..c1672867989 100644
--- a/src/Nest/DSL/OptimizeDescriptor.cs
+++ b/src/Nest/DSL/OptimizeDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Paths/DocumentOptionalPathDescriptor.cs b/src/Nest/DSL/Paths/DocumentOptionalPathDescriptor.cs
index 0ee769c2216..d8dab1968a7 100644
--- a/src/Nest/DSL/Paths/DocumentOptionalPathDescriptor.cs
+++ b/src/Nest/DSL/Paths/DocumentOptionalPathDescriptor.cs
@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Paths/DocumentPathDescriptor.cs b/src/Nest/DSL/Paths/DocumentPathDescriptor.cs
index 563a15eadee..d3c1eac10f3 100644
--- a/src/Nest/DSL/Paths/DocumentPathDescriptor.cs
+++ b/src/Nest/DSL/Paths/DocumentPathDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Paths/FixedIndexTypePathDescriptor.cs b/src/Nest/DSL/Paths/FixedIndexTypePathDescriptor.cs
index 66fa0f389f4..83c250a62e7 100644
--- a/src/Nest/DSL/Paths/FixedIndexTypePathDescriptor.cs
+++ b/src/Nest/DSL/Paths/FixedIndexTypePathDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Paths/IndexNamePathDescriptor.cs b/src/Nest/DSL/Paths/IndexNamePathDescriptor.cs
index a98d0f454a3..5aa2fd17571 100644
--- a/src/Nest/DSL/Paths/IndexNamePathDescriptor.cs
+++ b/src/Nest/DSL/Paths/IndexNamePathDescriptor.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Paths/IndexOptionalPathDescriptor.cs b/src/Nest/DSL/Paths/IndexOptionalPathDescriptor.cs
index 309d8414d03..0ca0e79aeb4 100644
--- a/src/Nest/DSL/Paths/IndexOptionalPathDescriptor.cs
+++ b/src/Nest/DSL/Paths/IndexOptionalPathDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Paths/IndexPathDescriptor.cs b/src/Nest/DSL/Paths/IndexPathDescriptor.cs
index aaeb578f3e4..15dc162f721 100644
--- a/src/Nest/DSL/Paths/IndexPathDescriptor.cs
+++ b/src/Nest/DSL/Paths/IndexPathDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Paths/IndexTypePathDescriptor.cs b/src/Nest/DSL/Paths/IndexTypePathDescriptor.cs
index 4fe8b809617..2cd15175ae0 100644
--- a/src/Nest/DSL/Paths/IndexTypePathDescriptor.cs
+++ b/src/Nest/DSL/Paths/IndexTypePathDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Paths/IndicesOptionalExplicitAllPathDescriptor.cs b/src/Nest/DSL/Paths/IndicesOptionalExplicitAllPathDescriptor.cs
index f700e8226a3..7f037229110 100644
--- a/src/Nest/DSL/Paths/IndicesOptionalExplicitAllPathDescriptor.cs
+++ b/src/Nest/DSL/Paths/IndicesOptionalExplicitAllPathDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Paths/IndicesOptionalPathDescriptor.cs b/src/Nest/DSL/Paths/IndicesOptionalPathDescriptor.cs
index 7bd6d704a25..b22609d307e 100644
--- a/src/Nest/DSL/Paths/IndicesOptionalPathDescriptor.cs
+++ b/src/Nest/DSL/Paths/IndicesOptionalPathDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Paths/IndicesOptionalTypesNamePathDecriptor.cs b/src/Nest/DSL/Paths/IndicesOptionalTypesNamePathDecriptor.cs
index 2a243c3391f..cb4646410bf 100644
--- a/src/Nest/DSL/Paths/IndicesOptionalTypesNamePathDecriptor.cs
+++ b/src/Nest/DSL/Paths/IndicesOptionalTypesNamePathDecriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Paths/IndicesTypePathDescriptor.cs b/src/Nest/DSL/Paths/IndicesTypePathDescriptor.cs
index f4de6f7f236..a1730c274b5 100644
--- a/src/Nest/DSL/Paths/IndicesTypePathDescriptor.cs
+++ b/src/Nest/DSL/Paths/IndicesTypePathDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Paths/NamePathDescriptor.cs b/src/Nest/DSL/Paths/NamePathDescriptor.cs
index fe059756013..ed0e031dfab 100644
--- a/src/Nest/DSL/Paths/NamePathDescriptor.cs
+++ b/src/Nest/DSL/Paths/NamePathDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Paths/NodeIdOptionalDescriptor.cs b/src/Nest/DSL/Paths/NodeIdOptionalDescriptor.cs
index f54494c0c51..f212031f2da 100644
--- a/src/Nest/DSL/Paths/NodeIdOptionalDescriptor.cs
+++ b/src/Nest/DSL/Paths/NodeIdOptionalDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Paths/QueryPathDescriptor.cs b/src/Nest/DSL/Paths/QueryPathDescriptor.cs
index e027b3cb303..147d4927c1e 100644
--- a/src/Nest/DSL/Paths/QueryPathDescriptor.cs
+++ b/src/Nest/DSL/Paths/QueryPathDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Paths/RepositoryPathDescriptor.cs b/src/Nest/DSL/Paths/RepositoryPathDescriptor.cs
index eb35ddee772..1dda07461f9 100644
--- a/src/Nest/DSL/Paths/RepositoryPathDescriptor.cs
+++ b/src/Nest/DSL/Paths/RepositoryPathDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Paths/RepositorySnapshotPathDescriptor.cs b/src/Nest/DSL/Paths/RepositorySnapshotPathDescriptor.cs
index e58dd242234..d9cb55415a8 100644
--- a/src/Nest/DSL/Paths/RepositorySnapshotPathDescriptor.cs
+++ b/src/Nest/DSL/Paths/RepositorySnapshotPathDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/PercolateCountDescriptor.cs b/src/Nest/DSL/PercolateCountDescriptor.cs
index ee152e7f4cb..208b8f99865 100644
--- a/src/Nest/DSL/PercolateCountDescriptor.cs
+++ b/src/Nest/DSL/PercolateCountDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/PercolateDescriptor.cs b/src/Nest/DSL/PercolateDescriptor.cs
index ff484c1da06..52b7c1b1b72 100644
--- a/src/Nest/DSL/PercolateDescriptor.cs
+++ b/src/Nest/DSL/PercolateDescriptor.cs
@@ -3,7 +3,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
 using Elasticsearch.Net;
 using Nest.DSL.Descriptors;
 using Newtonsoft.Json;
diff --git a/src/Nest/DSL/PutTemplateDescriptor.cs b/src/Nest/DSL/PutTemplateDescriptor.cs
index d76d8220d2a..3e1cef568a5 100644
--- a/src/Nest/DSL/PutTemplateDescriptor.cs
+++ b/src/Nest/DSL/PutTemplateDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/PutWarmerDescriptor.cs b/src/Nest/DSL/PutWarmerDescriptor.cs
index 6ee38f0054d..8708998c9ff 100644
--- a/src/Nest/DSL/PutWarmerDescriptor.cs
+++ b/src/Nest/DSL/PutWarmerDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
diff --git a/src/Nest/DSL/Query/Behaviour/IFieldNameQuery.cs b/src/Nest/DSL/Query/Behaviour/IFieldNameQuery.cs
index f57e3991848..8f47b096273 100644
--- a/src/Nest/DSL/Query/Behaviour/IFieldNameQuery.cs
+++ b/src/Nest/DSL/Query/Behaviour/IFieldNameQuery.cs
@@ -1,6 +1,4 @@
-using Nest.Resolvers;
-
-namespace Nest.DSL.Query.Behaviour
+namespace Nest.DSL.Query.Behaviour
 {
 	public interface IFieldNameQuery : IQuery
 	{
diff --git a/src/Nest/DSL/Query/BoolQueryDescriptor.cs b/src/Nest/DSL/Query/BoolQueryDescriptor.cs
index 3b3fc8ca0e7..bb6cb3c40fb 100644
--- a/src/Nest/DSL/Query/BoolQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/BoolQueryDescriptor.cs
@@ -2,11 +2,8 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using System.Linq.Expressions;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/BoostingQueryDescriptor.cs b/src/Nest/DSL/Query/BoostingQueryDescriptor.cs
index 26bafaaeea4..3ad976c34d7 100644
--- a/src/Nest/DSL/Query/BoostingQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/BoostingQueryDescriptor.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using System.Linq.Expressions;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/CommonTermsQueryDescriptor.cs b/src/Nest/DSL/Query/CommonTermsQueryDescriptor.cs
index 671a51e429c..1f24370be6c 100644
--- a/src/Nest/DSL/Query/CommonTermsQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/CommonTermsQueryDescriptor.cs
@@ -1,15 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.DSL.Query.Behaviour;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
 using System.Globalization;
 using Newtonsoft.Json.Converters;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/ConditionlessQueryDescriptor.cs b/src/Nest/DSL/Query/ConditionlessQueryDescriptor.cs
index 1ec9375324a..22df553f817 100644
--- a/src/Nest/DSL/Query/ConditionlessQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/ConditionlessQueryDescriptor.cs
@@ -2,10 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Elasticsearch.Net;
-using System.Text;
-using Nest.Resolvers.Converters;
-using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/ConstantScoreQueryDescriptor.cs b/src/Nest/DSL/Query/ConstantScoreQueryDescriptor.cs
index 11a0f8462d5..23443482ec9 100644
--- a/src/Nest/DSL/Query/ConstantScoreQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/ConstantScoreQueryDescriptor.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/CustomBoostFactorQueryDescriptor.cs b/src/Nest/DSL/Query/CustomBoostFactorQueryDescriptor.cs
index 2fb1fa9d0bd..056d7857c86 100644
--- a/src/Nest/DSL/Query/CustomBoostFactorQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/CustomBoostFactorQueryDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Elasticsearch.Net;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Query/CustomFiltersScoreQueryDescriptor.cs b/src/Nest/DSL/Query/CustomFiltersScoreQueryDescriptor.cs
index dd7ad0c7573..e84319f9b72 100644
--- a/src/Nest/DSL/Query/CustomFiltersScoreQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/CustomFiltersScoreQueryDescriptor.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using Nest.DSL.Query;
 using Newtonsoft.Json.Converters;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/CustomScoreQueryDescriptor.cs b/src/Nest/DSL/Query/CustomScoreQueryDescriptor.cs
index 5ddf381091d..2055421d818 100644
--- a/src/Nest/DSL/Query/CustomScoreQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/CustomScoreQueryDescriptor.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
-using Elasticsearch.Net;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/DismaxQueryDescriptor.cs b/src/Nest/DSL/Query/DismaxQueryDescriptor.cs
index 3acc6c712c6..c7f9e6c4212 100644
--- a/src/Nest/DSL/Query/DismaxQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/DismaxQueryDescriptor.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/FilterScoreQueryDescriptor.cs b/src/Nest/DSL/Query/FilterScoreQueryDescriptor.cs
index 97379a53016..ea95ca047ce 100644
--- a/src/Nest/DSL/Query/FilterScoreQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/FilterScoreQueryDescriptor.cs
@@ -3,8 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Elasticsearch.Net;
 
 namespace Nest.DSL.Query
 {
diff --git a/src/Nest/DSL/Query/FilteredQueryDescriptor.cs b/src/Nest/DSL/Query/FilteredQueryDescriptor.cs
index 203122d35db..90cbf4e9845 100644
--- a/src/Nest/DSL/Query/FilteredQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/FilteredQueryDescriptor.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/FunctionScoreQueryDescriptor.cs b/src/Nest/DSL/Query/FunctionScoreQueryDescriptor.cs
index 84928ba825a..ab99417f1a2 100644
--- a/src/Nest/DSL/Query/FunctionScoreQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/FunctionScoreQueryDescriptor.cs
@@ -1,11 +1,6 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
diff --git a/src/Nest/DSL/Query/Functions/ExpFunction.cs b/src/Nest/DSL/Query/Functions/ExpFunction.cs
index f29d740e729..c51a0563cd6 100644
--- a/src/Nest/DSL/Query/Functions/ExpFunction.cs
+++ b/src/Nest/DSL/Query/Functions/ExpFunction.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/Query/Functions/FunctionScoreFunctionsDescriptor.cs b/src/Nest/DSL/Query/Functions/FunctionScoreFunctionsDescriptor.cs
index 437b1e335fb..e0b093afd58 100644
--- a/src/Nest/DSL/Query/Functions/FunctionScoreFunctionsDescriptor.cs
+++ b/src/Nest/DSL/Query/Functions/FunctionScoreFunctionsDescriptor.cs
@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
diff --git a/src/Nest/DSL/Query/Functions/GaussFunction.cs b/src/Nest/DSL/Query/Functions/GaussFunction.cs
index bc6eef3b9f1..6eef2a4c3c7 100644
--- a/src/Nest/DSL/Query/Functions/GaussFunction.cs
+++ b/src/Nest/DSL/Query/Functions/GaussFunction.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/Query/Functions/LinearFunction.cs b/src/Nest/DSL/Query/Functions/LinearFunction.cs
index d17b3fbca09..ca20312cbbf 100644
--- a/src/Nest/DSL/Query/Functions/LinearFunction.cs
+++ b/src/Nest/DSL/Query/Functions/LinearFunction.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/Query/Functions/RandomScoreFunction.cs b/src/Nest/DSL/Query/Functions/RandomScoreFunction.cs
index cc278b6f88b..e725c83634d 100644
--- a/src/Nest/DSL/Query/Functions/RandomScoreFunction.cs
+++ b/src/Nest/DSL/Query/Functions/RandomScoreFunction.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Elasticsearch.Net;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/FuzzyDateQueryDescriptor.cs b/src/Nest/DSL/Query/FuzzyDateQueryDescriptor.cs
index 6b099568259..8ba0dfa31ec 100644
--- a/src/Nest/DSL/Query/FuzzyDateQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/FuzzyDateQueryDescriptor.cs
@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.DSL.Query.Behaviour;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
 using System.Globalization;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
+
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
diff --git a/src/Nest/DSL/Query/FuzzyLikeThisQueryDescriptor.cs b/src/Nest/DSL/Query/FuzzyLikeThisQueryDescriptor.cs
index f15d0c0f1dd..e2004525a36 100644
--- a/src/Nest/DSL/Query/FuzzyLikeThisQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/FuzzyLikeThisQueryDescriptor.cs
@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using System.Linq.Expressions;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/FuzzyNumericQueryDescriptor.cs b/src/Nest/DSL/Query/FuzzyNumericQueryDescriptor.cs
index b0f3ad1e8c1..4686024e47e 100644
--- a/src/Nest/DSL/Query/FuzzyNumericQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/FuzzyNumericQueryDescriptor.cs
@@ -1,14 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Configuration;
-using System.Text;
 using Nest.DSL.Query.Behaviour;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
 using System.Globalization;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
+
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
diff --git a/src/Nest/DSL/Query/FuzzyQueryDescriptor.cs b/src/Nest/DSL/Query/FuzzyQueryDescriptor.cs
index 4be2fe00ee5..1524a43c0a7 100644
--- a/src/Nest/DSL/Query/FuzzyQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/FuzzyQueryDescriptor.cs
@@ -1,14 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.DSL.Query.Behaviour;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
 using System.Globalization;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/GeoShapeQueryDescriptor.cs b/src/Nest/DSL/Query/GeoShapeQueryDescriptor.cs
index 27a17267af1..49e147425c3 100644
--- a/src/Nest/DSL/Query/GeoShapeQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/GeoShapeQueryDescriptor.cs
@@ -2,11 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
 using Nest.DSL.Query.Behaviour;
-using Nest.Resolvers;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/HasChildQueryDescriptor.cs b/src/Nest/DSL/Query/HasChildQueryDescriptor.cs
index a6906f85f88..e16daa0a26d 100644
--- a/src/Nest/DSL/Query/HasChildQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/HasChildQueryDescriptor.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using System.Linq.Expressions;
-using Nest.Resolvers;
 using Newtonsoft.Json.Converters;
 
 namespace Nest
diff --git a/src/Nest/DSL/Query/HasParentQueryDescriptor.cs b/src/Nest/DSL/Query/HasParentQueryDescriptor.cs
index 58531d11a25..c597cde9053 100644
--- a/src/Nest/DSL/Query/HasParentQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/HasParentQueryDescriptor.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using System.Linq.Expressions;
-using Nest.Resolvers;
 using Newtonsoft.Json.Converters;
 
 namespace Nest
diff --git a/src/Nest/DSL/Query/IQuery.cs b/src/Nest/DSL/Query/IQuery.cs
index 3f6447ac51b..61145c2aaf6 100644
--- a/src/Nest/DSL/Query/IQuery.cs
+++ b/src/Nest/DSL/Query/IQuery.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Linq.Expressions;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/IdsQueryDescriptor.cs b/src/Nest/DSL/Query/IdsQueryDescriptor.cs
index 1843fba2ac0..979dd359b8c 100644
--- a/src/Nest/DSL/Query/IdsQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/IdsQueryDescriptor.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/IndicesQueryDescriptor.cs b/src/Nest/DSL/Query/IndicesQueryDescriptor.cs
index b15dd11dbd0..be073858c0f 100644
--- a/src/Nest/DSL/Query/IndicesQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/IndicesQueryDescriptor.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using System.Linq.Expressions;
 using Newtonsoft.Json.Converters;
 
 
diff --git a/src/Nest/DSL/Query/MatchAllQuery.cs b/src/Nest/DSL/Query/MatchAllQuery.cs
index e8c820e226c..d64ce816775 100644
--- a/src/Nest/DSL/Query/MatchAllQuery.cs
+++ b/src/Nest/DSL/Query/MatchAllQuery.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Query/MatchPhrasePrefixQueryDescriptor.cs b/src/Nest/DSL/Query/MatchPhrasePrefixQueryDescriptor.cs
index 9af52fbd5da..44fdc67fe6d 100644
--- a/src/Nest/DSL/Query/MatchPhrasePrefixQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/MatchPhrasePrefixQueryDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/MatchPhraseQueryDescriptor.cs b/src/Nest/DSL/Query/MatchPhraseQueryDescriptor.cs
index 9084118072f..f3c758ccafd 100644
--- a/src/Nest/DSL/Query/MatchPhraseQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/MatchPhraseQueryDescriptor.cs
@@ -1,10 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.Linq.Expressions;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/MatchQueryDescriptor.cs b/src/Nest/DSL/Query/MatchQueryDescriptor.cs
index 94d3eaca3d9..fceb940187d 100644
--- a/src/Nest/DSL/Query/MatchQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/MatchQueryDescriptor.cs
@@ -1,14 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.DSL.Query.Behaviour;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using System.Linq.Expressions;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/MoreLikeThisQueryDescriptor.cs b/src/Nest/DSL/Query/MoreLikeThisQueryDescriptor.cs
index eb28292e5a1..7acffd3a588 100644
--- a/src/Nest/DSL/Query/MoreLikeThisQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/MoreLikeThisQueryDescriptor.cs
@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using System.Linq.Expressions;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/MultiMatchQueryDescriptor.cs b/src/Nest/DSL/Query/MultiMatchQueryDescriptor.cs
index 05e8dc7fae1..86344015b1d 100644
--- a/src/Nest/DSL/Query/MultiMatchQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/MultiMatchQueryDescriptor.cs
@@ -1,13 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using Elasticsearch.Net;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/NestedQueryDescriptor.cs b/src/Nest/DSL/Query/NestedQueryDescriptor.cs
index d5034b45b06..da35e847a9b 100644
--- a/src/Nest/DSL/Query/NestedQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/NestedQueryDescriptor.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
 using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/PrefixQueryDescriptor.cs b/src/Nest/DSL/Query/PrefixQueryDescriptor.cs
index 81b3a572b5e..c8723757804 100644
--- a/src/Nest/DSL/Query/PrefixQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/PrefixQueryDescriptor.cs
@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.DSL.Query.Behaviour;
-using Nest.Resolvers;
 using Newtonsoft.Json;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json.Converters;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/QueryContainer.cs b/src/Nest/DSL/Query/QueryContainer.cs
index 1995075c250..2d0322ab7e0 100644
--- a/src/Nest/DSL/Query/QueryContainer.cs
+++ b/src/Nest/DSL/Query/QueryContainer.cs
@@ -1,14 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.DSL.Visitor;
-using Nest.Resolvers;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
-using Elasticsearch.Net;
-using System.Linq.Expressions;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/QueryDescriptor.cs b/src/Nest/DSL/Query/QueryDescriptor.cs
index 045e20efb82..548999cdc4f 100644
--- a/src/Nest/DSL/Query/QueryDescriptor.cs
+++ b/src/Nest/DSL/Query/QueryDescriptor.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Elasticsearch.Net;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/QueryStringDescriptor.cs b/src/Nest/DSL/Query/QueryStringDescriptor.cs
index 042a4401e39..c37738401ca 100644
--- a/src/Nest/DSL/Query/QueryStringDescriptor.cs
+++ b/src/Nest/DSL/Query/QueryStringDescriptor.cs
@@ -1,14 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
-using System.Globalization;
 using Newtonsoft.Json.Converters;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/RangeQueryDescriptor.cs b/src/Nest/DSL/Query/RangeQueryDescriptor.cs
index 494ceccb257..6ed35d0a15e 100644
--- a/src/Nest/DSL/Query/RangeQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/RangeQueryDescriptor.cs
@@ -2,12 +2,9 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 using Nest.DSL.Query.Behaviour;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/RegexpQueryDescriptor.cs b/src/Nest/DSL/Query/RegexpQueryDescriptor.cs
index 0de399e1598..5593cc58d8c 100644
--- a/src/Nest/DSL/Query/RegexpQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/RegexpQueryDescriptor.cs
@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.DSL.Query.Behaviour;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/SimpleQueryStringQueryDescriptor.cs b/src/Nest/DSL/Query/SimpleQueryStringQueryDescriptor.cs
index 665e36781a7..5b8885b1ad4 100644
--- a/src/Nest/DSL/Query/SimpleQueryStringQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/SimpleQueryStringQueryDescriptor.cs
@@ -1,14 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
-using System.Globalization;
 using Newtonsoft.Json.Converters;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/SpanFirstQueryDescriptor.cs b/src/Nest/DSL/Query/SpanFirstQueryDescriptor.cs
index 5a1b931be03..264ad1f6a06 100644
--- a/src/Nest/DSL/Query/SpanFirstQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/SpanFirstQueryDescriptor.cs
@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Linq.Expressions;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/SpanNearQueryDescriptor.cs b/src/Nest/DSL/Query/SpanNearQueryDescriptor.cs
index e704d11dd32..e7611936b9c 100644
--- a/src/Nest/DSL/Query/SpanNearQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/SpanNearQueryDescriptor.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Linq.Expressions;
-using Elasticsearch.Net;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Query/SpanNotQueryDescriptor.cs b/src/Nest/DSL/Query/SpanNotQueryDescriptor.cs
index 147486217ce..3652251bd65 100644
--- a/src/Nest/DSL/Query/SpanNotQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/SpanNotQueryDescriptor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Linq.Expressions;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Query/SpanOrQueryDescriptor.cs b/src/Nest/DSL/Query/SpanOrQueryDescriptor.cs
index ea40d96bd20..1c30279b5c1 100644
--- a/src/Nest/DSL/Query/SpanOrQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/SpanOrQueryDescriptor.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Linq.Expressions;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/SpanQueryDescriptor.cs b/src/Nest/DSL/Query/SpanQueryDescriptor.cs
index 2983bf4305a..8478b4389f3 100644
--- a/src/Nest/DSL/Query/SpanQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/SpanQueryDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Linq.Expressions;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
diff --git a/src/Nest/DSL/Query/SpanTermQueryDescriptor.cs b/src/Nest/DSL/Query/SpanTermQueryDescriptor.cs
index abd421098e4..2acc9fcb171 100644
--- a/src/Nest/DSL/Query/SpanTermQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/SpanTermQueryDescriptor.cs
@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.DSL.Query.Behaviour;
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/Query/SubDescriptors/ExternalFieldDeclarationDescriptor.cs b/src/Nest/DSL/Query/SubDescriptors/ExternalFieldDeclarationDescriptor.cs
index 89e5df28dea..6948416ade9 100644
--- a/src/Nest/DSL/Query/SubDescriptors/ExternalFieldDeclarationDescriptor.cs
+++ b/src/Nest/DSL/Query/SubDescriptors/ExternalFieldDeclarationDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Globalization;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/Query/SubDescriptors/IExternalFieldDeclarationDescriptor.cs b/src/Nest/DSL/Query/SubDescriptors/IExternalFieldDeclarationDescriptor.cs
index 24d437b8f42..68780e4c9c2 100644
--- a/src/Nest/DSL/Query/SubDescriptors/IExternalFieldDeclarationDescriptor.cs
+++ b/src/Nest/DSL/Query/SubDescriptors/IExternalFieldDeclarationDescriptor.cs
@@ -1,5 +1,4 @@
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
+using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/Query/TermQueryDescriptor.cs b/src/Nest/DSL/Query/TermQueryDescriptor.cs
index 02b415453ac..352ece44c94 100644
--- a/src/Nest/DSL/Query/TermQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/TermQueryDescriptor.cs
@@ -1,15 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Linq.Expressions;
 using Nest.DSL.Query.Behaviour;
-using Nest.Resolvers;
-using Nest.Resolvers.Converters.Queries;
-using Newtonsoft.Json.Serialization;
 using Newtonsoft.Json;
-using Nest.Resolvers.Converters;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/TermsQueryDescriptor.cs b/src/Nest/DSL/Query/TermsQueryDescriptor.cs
index 6e3106bcd5d..481e4b18290 100644
--- a/src/Nest/DSL/Query/TermsQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/TermsQueryDescriptor.cs
@@ -2,15 +2,10 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
-using Elasticsearch.Net;
-using Nest.DSL.Query.Behaviour;
-using Nest.Resolvers.Converters;
 using Nest.Resolvers.Converters.Queries;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
+
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
diff --git a/src/Nest/DSL/Query/TopChildrenQueryDescriptor.cs b/src/Nest/DSL/Query/TopChildrenQueryDescriptor.cs
index d32fe346bae..bb3c8c38cdb 100644
--- a/src/Nest/DSL/Query/TopChildrenQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/TopChildrenQueryDescriptor.cs
@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using System.Linq.Expressions;
 using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Query/WildcardQueryDescriptor.cs b/src/Nest/DSL/Query/WildcardQueryDescriptor.cs
index fc7d73d6dd5..76d0f8d1d5b 100644
--- a/src/Nest/DSL/Query/WildcardQueryDescriptor.cs
+++ b/src/Nest/DSL/Query/WildcardQueryDescriptor.cs
@@ -2,12 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
 using Nest.DSL.Query.Behaviour;
-using Nest.Resolvers;
 using Newtonsoft.Json;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json.Converters;
 
 namespace Nest
diff --git a/src/Nest/DSL/RefreshDescriptor.cs b/src/Nest/DSL/RefreshDescriptor.cs
index 81339a603e0..0b1032c6209 100644
--- a/src/Nest/DSL/RefreshDescriptor.cs
+++ b/src/Nest/DSL/RefreshDescriptor.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/RegisterPercolatorDescriptor.cs b/src/Nest/DSL/RegisterPercolatorDescriptor.cs
index f08235217ec..67d7f76e5b1 100644
--- a/src/Nest/DSL/RegisterPercolatorDescriptor.cs
+++ b/src/Nest/DSL/RegisterPercolatorDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
diff --git a/src/Nest/DSL/Repository/AzureRepositoryDescriptor.cs b/src/Nest/DSL/Repository/AzureRepositoryDescriptor.cs
index b626f9e1f61..1d3aedd791e 100644
--- a/src/Nest/DSL/Repository/AzureRepositoryDescriptor.cs
+++ b/src/Nest/DSL/Repository/AzureRepositoryDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Repository/FileSystemRepositoryDescriptor.cs b/src/Nest/DSL/Repository/FileSystemRepositoryDescriptor.cs
index cd2c9a1d48e..4511028a624 100644
--- a/src/Nest/DSL/Repository/FileSystemRepositoryDescriptor.cs
+++ b/src/Nest/DSL/Repository/FileSystemRepositoryDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Repository/HdfsRepositoryDescriptor.cs b/src/Nest/DSL/Repository/HdfsRepositoryDescriptor.cs
index d6c10e1c263..3128d43133f 100644
--- a/src/Nest/DSL/Repository/HdfsRepositoryDescriptor.cs
+++ b/src/Nest/DSL/Repository/HdfsRepositoryDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Repository/S3RepositoryDescriptor.cs b/src/Nest/DSL/Repository/S3RepositoryDescriptor.cs
index 489a93f0a6d..058c56f651e 100644
--- a/src/Nest/DSL/Repository/S3RepositoryDescriptor.cs
+++ b/src/Nest/DSL/Repository/S3RepositoryDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Rescore/RescoreDescriptor.cs b/src/Nest/DSL/Rescore/RescoreDescriptor.cs
index 09e27d235e6..ab90a7ba356 100644
--- a/src/Nest/DSL/Rescore/RescoreDescriptor.cs
+++ b/src/Nest/DSL/Rescore/RescoreDescriptor.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Linq.Expressions;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/RestoreDescriptor.cs b/src/Nest/DSL/RestoreDescriptor.cs
index 8210b142917..bdcd63134f6 100644
--- a/src/Nest/DSL/RestoreDescriptor.cs
+++ b/src/Nest/DSL/RestoreDescriptor.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/ScrollDescriptor.cs b/src/Nest/DSL/ScrollDescriptor.cs
index 530c7cd356f..81014812e86 100644
--- a/src/Nest/DSL/ScrollDescriptor.cs
+++ b/src/Nest/DSL/ScrollDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Search/HighlightDescriptor.cs b/src/Nest/DSL/Search/HighlightDescriptor.cs
index 77b4dc87298..4400111a255 100644
--- a/src/Nest/DSL/Search/HighlightDescriptor.cs
+++ b/src/Nest/DSL/Search/HighlightDescriptor.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Search/HighlightFieldDescriptor.cs b/src/Nest/DSL/Search/HighlightFieldDescriptor.cs
index 5101aa247f5..5f784c60b46 100644
--- a/src/Nest/DSL/Search/HighlightFieldDescriptor.cs
+++ b/src/Nest/DSL/Search/HighlightFieldDescriptor.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Linq.Expressions;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Search/SearchSourceDescriptor.cs b/src/Nest/DSL/Search/SearchSourceDescriptor.cs
index f10d027895a..d12867448bb 100644
--- a/src/Nest/DSL/Search/SearchSourceDescriptor.cs
+++ b/src/Nest/DSL/Search/SearchSourceDescriptor.cs
@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/Search/SortFieldDescriptor.cs b/src/Nest/DSL/Search/SortFieldDescriptor.cs
index 4a7a7c89d56..50344302967 100644
--- a/src/Nest/DSL/Search/SortFieldDescriptor.cs
+++ b/src/Nest/DSL/Search/SortFieldDescriptor.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using System.Linq.Expressions;
 using Newtonsoft.Json;
-using Nest.Resolvers;
 using Newtonsoft.Json.Converters;
 
 namespace Nest
diff --git a/src/Nest/DSL/Search/SortGeoDistanceDescriptor.cs b/src/Nest/DSL/Search/SortGeoDistanceDescriptor.cs
index 0e7cad4682a..52bc93c9923 100644
--- a/src/Nest/DSL/Search/SortGeoDistanceDescriptor.cs
+++ b/src/Nest/DSL/Search/SortGeoDistanceDescriptor.cs
@@ -1,14 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using System.Linq.Expressions;
 using System.Globalization;
-using Nest.Resolvers;
 using Nest.Resolvers.Converters;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Search/SortScriptDescriptor.cs b/src/Nest/DSL/Search/SortScriptDescriptor.cs
index 9ff3121da41..5fbb542ef17 100644
--- a/src/Nest/DSL/Search/SortScriptDescriptor.cs
+++ b/src/Nest/DSL/Search/SortScriptDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest.DSL.Descriptors
diff --git a/src/Nest/DSL/SearchDescriptor.cs b/src/Nest/DSL/SearchDescriptor.cs
index 6d7e64080ec..64bc1189424 100644
--- a/src/Nest/DSL/SearchDescriptor.cs
+++ b/src/Nest/DSL/SearchDescriptor.cs
@@ -1,15 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
-using Elasticsearch.Net.Connection;
-using Elasticsearch.Net.Connection.Configuration;
 using Newtonsoft.Json;
 using Nest.Resolvers.Converters;
 using System.Linq.Expressions;
 using Nest.DSL.Descriptors;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/SegmentsDescriptor.cs b/src/Nest/DSL/SegmentsDescriptor.cs
index e38fda4fce4..95eb552ccb7 100644
--- a/src/Nest/DSL/SegmentsDescriptor.cs
+++ b/src/Nest/DSL/SegmentsDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/SimilarityDescriptor.cs b/src/Nest/DSL/SimilarityDescriptor.cs
index 814407a28d3..779cb6df696 100644
--- a/src/Nest/DSL/SimilarityDescriptor.cs
+++ b/src/Nest/DSL/SimilarityDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/SnapshotDescriptor.cs b/src/Nest/DSL/SnapshotDescriptor.cs
index 0e6ad0a8b2d..9bc3b73fdc0 100644
--- a/src/Nest/DSL/SnapshotDescriptor.cs
+++ b/src/Nest/DSL/SnapshotDescriptor.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/SourceDescriptor.cs b/src/Nest/DSL/SourceDescriptor.cs
index ac5e91c4471..f80c0b49ff4 100644
--- a/src/Nest/DSL/SourceDescriptor.cs
+++ b/src/Nest/DSL/SourceDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Suggest/BaseSuggestDescriptor.cs b/src/Nest/DSL/Suggest/BaseSuggestDescriptor.cs
index d15a649ba9e..994f7f0d6c0 100644
--- a/src/Nest/DSL/Suggest/BaseSuggestDescriptor.cs
+++ b/src/Nest/DSL/Suggest/BaseSuggestDescriptor.cs
@@ -1,5 +1,4 @@
-using Nest.Resolvers;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Suggest/CompletionSuggestDescriptor.cs b/src/Nest/DSL/Suggest/CompletionSuggestDescriptor.cs
index f151faf4135..23fb17f2132 100644
--- a/src/Nest/DSL/Suggest/CompletionSuggestDescriptor.cs
+++ b/src/Nest/DSL/Suggest/CompletionSuggestDescriptor.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Suggest/DirectGeneratorDescriptor.cs b/src/Nest/DSL/Suggest/DirectGeneratorDescriptor.cs
index aab057b3d9c..0d154fbbe05 100644
--- a/src/Nest/DSL/Suggest/DirectGeneratorDescriptor.cs
+++ b/src/Nest/DSL/Suggest/DirectGeneratorDescriptor.cs
@@ -3,7 +3,6 @@
 using Elasticsearch.Net;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Nest.Resolvers;
 using Newtonsoft.Json.Converters;
 
 namespace Nest
diff --git a/src/Nest/DSL/Suggest/FuzzySuggestDescriptor.cs b/src/Nest/DSL/Suggest/FuzzySuggestDescriptor.cs
index f736500acd2..0c4e3b709d9 100644
--- a/src/Nest/DSL/Suggest/FuzzySuggestDescriptor.cs
+++ b/src/Nest/DSL/Suggest/FuzzySuggestDescriptor.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Suggest/PhraseSuggestDescriptor.cs b/src/Nest/DSL/Suggest/PhraseSuggestDescriptor.cs
index ee253b24768..233caed2e84 100644
--- a/src/Nest/DSL/Suggest/PhraseSuggestDescriptor.cs
+++ b/src/Nest/DSL/Suggest/PhraseSuggestDescriptor.cs
@@ -4,7 +4,6 @@
 using System.Linq.Expressions;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Suggest/TermSuggestDescriptor.cs b/src/Nest/DSL/Suggest/TermSuggestDescriptor.cs
index f0419158d4d..854df9fd619 100644
--- a/src/Nest/DSL/Suggest/TermSuggestDescriptor.cs
+++ b/src/Nest/DSL/Suggest/TermSuggestDescriptor.cs
@@ -3,7 +3,6 @@
 using Elasticsearch.Net;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Nest.Resolvers;
 using Newtonsoft.Json.Converters;
 
 namespace Nest
diff --git a/src/Nest/DSL/SuggestDescriptor.cs b/src/Nest/DSL/SuggestDescriptor.cs
index 688a26ee340..e4ddb472c94 100644
--- a/src/Nest/DSL/SuggestDescriptor.cs
+++ b/src/Nest/DSL/SuggestDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
diff --git a/src/Nest/DSL/TermVector/MultiTermVectorDocumentDescriptor.cs b/src/Nest/DSL/TermVector/MultiTermVectorDocumentDescriptor.cs
index fb889799cf6..0ee904ca28b 100644
--- a/src/Nest/DSL/TermVector/MultiTermVectorDocumentDescriptor.cs
+++ b/src/Nest/DSL/TermVector/MultiTermVectorDocumentDescriptor.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Linq.Expressions;
 using Elasticsearch.Net;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/TermVectorDescriptor.cs b/src/Nest/DSL/TermVectorDescriptor.cs
index 7fa07da90a9..04a96f71b0f 100644
--- a/src/Nest/DSL/TermVectorDescriptor.cs
+++ b/src/Nest/DSL/TermVectorDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/Termplates/CreateWarmerDescriptor.cs b/src/Nest/DSL/Termplates/CreateWarmerDescriptor.cs
index ba13dce13ac..ec42f61a231 100644
--- a/src/Nest/DSL/Termplates/CreateWarmerDescriptor.cs
+++ b/src/Nest/DSL/Termplates/CreateWarmerDescriptor.cs
@@ -1,12 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
-using System.Linq.Expressions;
-using Nest.Resolvers;
-using Nest.Domain;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/UnregisterPercolatorDescriptor.cs b/src/Nest/DSL/UnregisterPercolatorDescriptor.cs
index c59e2e365b1..b332aa03283 100644
--- a/src/Nest/DSL/UnregisterPercolatorDescriptor.cs
+++ b/src/Nest/DSL/UnregisterPercolatorDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/DSL/UpdateDescriptor.cs b/src/Nest/DSL/UpdateDescriptor.cs
index d3f0ccaaf0a..39cdf70be3c 100644
--- a/src/Nest/DSL/UpdateDescriptor.cs
+++ b/src/Nest/DSL/UpdateDescriptor.cs
@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
 using Elasticsearch.Net;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/DSL/UpdateSettingsDescriptor.cs b/src/Nest/DSL/UpdateSettingsDescriptor.cs
index 60e4a99f21c..0f392688997 100644
--- a/src/Nest/DSL/UpdateSettingsDescriptor.cs
+++ b/src/Nest/DSL/UpdateSettingsDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/ValidateQueryDescriptor.cs b/src/Nest/DSL/ValidateQueryDescriptor.cs
index 1cfbb8ac4aa..c026e96dbab 100644
--- a/src/Nest/DSL/ValidateQueryDescriptor.cs
+++ b/src/Nest/DSL/ValidateQueryDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
-using Nest.Resolvers.Converters;
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/Visitor/DslPrettyPrintVisitor.cs b/src/Nest/DSL/Visitor/DslPrettyPrintVisitor.cs
index c77a73350fa..749b467b3e5 100644
--- a/src/Nest/DSL/Visitor/DslPrettyPrintVisitor.cs
+++ b/src/Nest/DSL/Visitor/DslPrettyPrintVisitor.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Nest.Resolvers;
 
 namespace Nest.DSL.Visitor
 {
diff --git a/src/Nest/DSL/Visitor/QueryFilterWalker.cs b/src/Nest/DSL/Visitor/QueryFilterWalker.cs
index c3b740fb9b6..36abd019031 100644
--- a/src/Nest/DSL/Visitor/QueryFilterWalker.cs
+++ b/src/Nest/DSL/Visitor/QueryFilterWalker.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest.DSL.Visitor
 {
diff --git a/src/Nest/DSL/Visitor/QueryVisitor.cs b/src/Nest/DSL/Visitor/QueryVisitor.cs
index 254eebed338..acbea56559c 100644
--- a/src/Nest/DSL/Visitor/QueryVisitor.cs
+++ b/src/Nest/DSL/Visitor/QueryVisitor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest.DSL.Visitor
 {
diff --git a/src/Nest/DSL/_Descriptors.generated.cs b/src/Nest/DSL/_Descriptors.generated.cs
index 786ee506d6e..784c77eeced 100644
--- a/src/Nest/DSL/_Descriptors.generated.cs
+++ b/src/Nest/DSL/_Descriptors.generated.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Linq.Expressions;
 using Elasticsearch.Net;
 ///This file lays the base for all the descriptors based on the query string parameters in the spec for IElasticClient.
diff --git a/src/Nest/DSL/_Requests.generated.cs b/src/Nest/DSL/_Requests.generated.cs
index 0e8214779ee..dacb48bc20f 100644
--- a/src/Nest/DSL/_Requests.generated.cs
+++ b/src/Nest/DSL/_Requests.generated.cs
@@ -2,8 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Linq.Expressions;
 using Elasticsearch.Net;
 
 ///This file contains all the typed querystring parameters that are generated of the client spec.
diff --git a/src/Nest/Domain/Aggregations/IAggration.cs b/src/Nest/Domain/Aggregations/IAggration.cs
index 66c3b998d5a..b592b24d1b0 100644
--- a/src/Nest/Domain/Aggregations/IAggration.cs
+++ b/src/Nest/Domain/Aggregations/IAggration.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Aggregations/IBucketAggregation.cs b/src/Nest/Domain/Aggregations/IBucketAggregation.cs
index b7aa30fc919..174b5cd6437 100644
--- a/src/Nest/Domain/Aggregations/IBucketAggregation.cs
+++ b/src/Nest/Domain/Aggregations/IBucketAggregation.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Nest;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Alias/AliasAddOperation.cs b/src/Nest/Domain/Alias/AliasAddOperation.cs
index b7f4efaee11..aaabe28fa21 100644
--- a/src/Nest/Domain/Alias/AliasAddOperation.cs
+++ b/src/Nest/Domain/Alias/AliasAddOperation.cs
@@ -1,5 +1,4 @@
-using Nest.Resolvers;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Alias/AliasRemoveOperation.cs b/src/Nest/Domain/Alias/AliasRemoveOperation.cs
index 908517840d2..060717394b4 100644
--- a/src/Nest/Domain/Alias/AliasRemoveOperation.cs
+++ b/src/Nest/Domain/Alias/AliasRemoveOperation.cs
@@ -1,5 +1,4 @@
-using Nest.Resolvers;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Alias/CreateAliasDescriptor.cs b/src/Nest/Domain/Alias/CreateAliasDescriptor.cs
index 7e0064f9535..8af91f8df75 100644
--- a/src/Nest/Domain/Alias/CreateAliasDescriptor.cs
+++ b/src/Nest/Domain/Alias/CreateAliasDescriptor.cs
@@ -1,6 +1,5 @@
 using System;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Alias/IAliasAction.cs b/src/Nest/Domain/Alias/IAliasAction.cs
index 281f5c2fd53..f1ced1edf48 100644
--- a/src/Nest/Domain/Alias/IAliasAction.cs
+++ b/src/Nest/Domain/Alias/IAliasAction.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Analysis/Analyzers/AnalyzerBase.cs b/src/Nest/Domain/Analysis/Analyzers/AnalyzerBase.cs
index 5b37232cfca..3dfe7688b7a 100644
--- a/src/Nest/Domain/Analysis/Analyzers/AnalyzerBase.cs
+++ b/src/Nest/Domain/Analysis/Analyzers/AnalyzerBase.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Analysis/Analyzers/KeywordAnalyzer.cs b/src/Nest/Domain/Analysis/Analyzers/KeywordAnalyzer.cs
index d5737f96ebd..0b81abbccb5 100644
--- a/src/Nest/Domain/Analysis/Analyzers/KeywordAnalyzer.cs
+++ b/src/Nest/Domain/Analysis/Analyzers/KeywordAnalyzer.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Analysis/Analyzers/LanguageAnalyzer.cs b/src/Nest/Domain/Analysis/Analyzers/LanguageAnalyzer.cs
index 0f28451314f..f4da185eb9c 100644
--- a/src/Nest/Domain/Analysis/Analyzers/LanguageAnalyzer.cs
+++ b/src/Nest/Domain/Analysis/Analyzers/LanguageAnalyzer.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Analysis/Analyzers/SimpleAnalyzer.cs b/src/Nest/Domain/Analysis/Analyzers/SimpleAnalyzer.cs
index 332634f5130..cd2abf077b4 100644
--- a/src/Nest/Domain/Analysis/Analyzers/SimpleAnalyzer.cs
+++ b/src/Nest/Domain/Analysis/Analyzers/SimpleAnalyzer.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Analysis/Analyzers/WhitespaceAnalyzer.cs b/src/Nest/Domain/Analysis/Analyzers/WhitespaceAnalyzer.cs
index 601c7ce162a..b2faf47d9f5 100644
--- a/src/Nest/Domain/Analysis/Analyzers/WhitespaceAnalyzer.cs
+++ b/src/Nest/Domain/Analysis/Analyzers/WhitespaceAnalyzer.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Analysis/CharFilter/HtmlStripCharFilter.cs b/src/Nest/Domain/Analysis/CharFilter/HtmlStripCharFilter.cs
index 80a805ed444..09a97d4a794 100644
--- a/src/Nest/Domain/Analysis/CharFilter/HtmlStripCharFilter.cs
+++ b/src/Nest/Domain/Analysis/CharFilter/HtmlStripCharFilter.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Analysis/TokenFilter/KStemTokenFilter.cs b/src/Nest/Domain/Analysis/TokenFilter/KStemTokenFilter.cs
index 5d5d985546f..05534d002ab 100644
--- a/src/Nest/Domain/Analysis/TokenFilter/KStemTokenFilter.cs
+++ b/src/Nest/Domain/Analysis/TokenFilter/KStemTokenFilter.cs
@@ -1,6 +1,4 @@
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
     /// <summary>
 	///The kstem token filter is a high performance filter for english. 
diff --git a/src/Nest/Domain/Analysis/TokenFilter/PorterStemTokenFilter.cs b/src/Nest/Domain/Analysis/TokenFilter/PorterStemTokenFilter.cs
index 47f4d09df41..84b34fd83a5 100644
--- a/src/Nest/Domain/Analysis/TokenFilter/PorterStemTokenFilter.cs
+++ b/src/Nest/Domain/Analysis/TokenFilter/PorterStemTokenFilter.cs
@@ -1,6 +1,4 @@
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
     /// <summary>
 	/// A token filter of type porterStem that transforms the token stream as per the Porter stemming algorithm.
diff --git a/src/Nest/Domain/Analysis/TokenFilter/ReverseTokenFilter.cs b/src/Nest/Domain/Analysis/TokenFilter/ReverseTokenFilter.cs
index 1378abb4648..16d67eed3bb 100644
--- a/src/Nest/Domain/Analysis/TokenFilter/ReverseTokenFilter.cs
+++ b/src/Nest/Domain/Analysis/TokenFilter/ReverseTokenFilter.cs
@@ -1,6 +1,4 @@
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
 	/// <summary>
 	/// A token filter of type reverse that simply reverses the tokens.
diff --git a/src/Nest/Domain/Analysis/TokenFilter/StandardTokenFilter.cs b/src/Nest/Domain/Analysis/TokenFilter/StandardTokenFilter.cs
index 822a39f6429..b4013b3e915 100644
--- a/src/Nest/Domain/Analysis/TokenFilter/StandardTokenFilter.cs
+++ b/src/Nest/Domain/Analysis/TokenFilter/StandardTokenFilter.cs
@@ -1,6 +1,4 @@
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
 	/// <summary>
 	/// A token filter of type standard that normalizes tokens extracted with the Standard Tokenizer.
diff --git a/src/Nest/Domain/Analysis/TokenFilter/TrimTokenFilter.cs b/src/Nest/Domain/Analysis/TokenFilter/TrimTokenFilter.cs
index 136e182f6d7..d7289ce1e8a 100644
--- a/src/Nest/Domain/Analysis/TokenFilter/TrimTokenFilter.cs
+++ b/src/Nest/Domain/Analysis/TokenFilter/TrimTokenFilter.cs
@@ -1,6 +1,4 @@
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
 	/// <summary>
 	/// The trim token filter trims surrounding whitespaces around a token.
diff --git a/src/Nest/Domain/Analysis/TokenFilter/UppercaseTokenFilter.cs b/src/Nest/Domain/Analysis/TokenFilter/UppercaseTokenFilter.cs
index 296e6c526f0..791da62c269 100644
--- a/src/Nest/Domain/Analysis/TokenFilter/UppercaseTokenFilter.cs
+++ b/src/Nest/Domain/Analysis/TokenFilter/UppercaseTokenFilter.cs
@@ -1,6 +1,4 @@
-using Newtonsoft.Json;
-
-namespace Nest
+namespace Nest
 {
     /// <summary>
     /// A token filter of type uppercase that normalizes token text to upper case.
diff --git a/src/Nest/Domain/Analysis/Tokenizer/LetterTokenizer.cs b/src/Nest/Domain/Analysis/Tokenizer/LetterTokenizer.cs
index c2edeaa9d15..1b07ed9e485 100644
--- a/src/Nest/Domain/Analysis/Tokenizer/LetterTokenizer.cs
+++ b/src/Nest/Domain/Analysis/Tokenizer/LetterTokenizer.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Analysis/Tokenizer/LowercaseTokenizer.cs b/src/Nest/Domain/Analysis/Tokenizer/LowercaseTokenizer.cs
index bd0ff49b086..ffc2c2f963a 100644
--- a/src/Nest/Domain/Analysis/Tokenizer/LowercaseTokenizer.cs
+++ b/src/Nest/Domain/Analysis/Tokenizer/LowercaseTokenizer.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Analysis/Tokenizer/TokenizerBase.cs b/src/Nest/Domain/Analysis/Tokenizer/TokenizerBase.cs
index 796dd292009..dd82aa43d0e 100644
--- a/src/Nest/Domain/Analysis/Tokenizer/TokenizerBase.cs
+++ b/src/Nest/Domain/Analysis/Tokenizer/TokenizerBase.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Analysis/Tokenizer/WhitespaceTokenizer.cs b/src/Nest/Domain/Analysis/Tokenizer/WhitespaceTokenizer.cs
index 87a5aa7dd1c..c7445b55e99 100644
--- a/src/Nest/Domain/Analysis/Tokenizer/WhitespaceTokenizer.cs
+++ b/src/Nest/Domain/Analysis/Tokenizer/WhitespaceTokenizer.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Bulk/BulkOperationDescriptorBase.cs b/src/Nest/Domain/Bulk/BulkOperationDescriptorBase.cs
index 5f90cfb93ad..ca87acea655 100644
--- a/src/Nest/Domain/Bulk/BulkOperationDescriptorBase.cs
+++ b/src/Nest/Domain/Bulk/BulkOperationDescriptorBase.cs
@@ -1,6 +1,5 @@
 using System;
 using Elasticsearch.Net;
-using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Connection/ConnectionSettings.cs b/src/Nest/Domain/Connection/ConnectionSettings.cs
index 12cc99c553e..607a80022c7 100644
--- a/src/Nest/Domain/Connection/ConnectionSettings.cs
+++ b/src/Nest/Domain/Connection/ConnectionSettings.cs
@@ -2,7 +2,6 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
-using Elasticsearch.Net;
 using Elasticsearch.Net.Connection;
 using Elasticsearch.Net.ConnectionPool;
 using Nest.Resolvers;
diff --git a/src/Nest/Domain/DSL/ChildScoreType.cs b/src/Nest/Domain/DSL/ChildScoreType.cs
index 8188b9fe912..61f5ecc6d8a 100644
--- a/src/Nest/Domain/DSL/ChildScoreType.cs
+++ b/src/Nest/Domain/DSL/ChildScoreType.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
diff --git a/src/Nest/Domain/DSL/Filter.cs b/src/Nest/Domain/DSL/Filter.cs
index a6413fc5e1c..628d6165bd7 100644
--- a/src/Nest/Domain/DSL/Filter.cs
+++ b/src/Nest/Domain/DSL/Filter.cs
@@ -1,10 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
 using System.Linq.Expressions;
 
 namespace Nest
diff --git a/src/Nest/Domain/DSL/GeoIndexedShapeVector.cs b/src/Nest/Domain/DSL/GeoIndexedShapeVector.cs
index 8e99d4db521..d98989ff75f 100644
--- a/src/Nest/Domain/DSL/GeoIndexedShapeVector.cs
+++ b/src/Nest/Domain/DSL/GeoIndexedShapeVector.cs
@@ -1,5 +1,4 @@
-using Nest.Resolvers;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/DSL/GeoShapeVector.cs b/src/Nest/Domain/DSL/GeoShapeVector.cs
index 30283890c9f..d1bde12d361 100644
--- a/src/Nest/Domain/DSL/GeoShapeVector.cs
+++ b/src/Nest/Domain/DSL/GeoShapeVector.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/DSL/ParentScoreType.cs b/src/Nest/Domain/DSL/ParentScoreType.cs
index dc31e09f659..96cfae636d2 100644
--- a/src/Nest/Domain/DSL/ParentScoreType.cs
+++ b/src/Nest/Domain/DSL/ParentScoreType.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
diff --git a/src/Nest/Domain/DSL/Query.cs b/src/Nest/Domain/DSL/Query.cs
index d7f2b84f09d..baae5038957 100644
--- a/src/Nest/Domain/DSL/Query.cs
+++ b/src/Nest/Domain/DSL/Query.cs
@@ -1,11 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.DSL.Query;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
 using System.Linq.Expressions;
 
 namespace Nest
diff --git a/src/Nest/Domain/Facets/Facet.cs b/src/Nest/Domain/Facets/Facet.cs
index 9b851c4a2df..e58ba6e6818 100644
--- a/src/Nest/Domain/Facets/Facet.cs
+++ b/src/Nest/Domain/Facets/Facet.cs
@@ -1,7 +1,6 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
-using Nest.Resolvers.Converters;
-
+
 namespace Nest
 {
     public interface IFacet
diff --git a/src/Nest/Domain/Facets/TermFacet.cs b/src/Nest/Domain/Facets/TermFacet.cs
index b7b0edbbd97..33382b41edc 100644
--- a/src/Nest/Domain/Facets/TermFacet.cs
+++ b/src/Nest/Domain/Facets/TermFacet.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using Nest.Resolvers.Converters;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/FluentDictionary.cs b/src/Nest/Domain/FluentDictionary.cs
index eb7a4f920b5..ab8fc8c605c 100644
--- a/src/Nest/Domain/FluentDictionary.cs
+++ b/src/Nest/Domain/FluentDictionary.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Hit/AnalyzeToken.cs b/src/Nest/Domain/Hit/AnalyzeToken.cs
index 3fde1fe87bc..2f14ebcd300 100644
--- a/src/Nest/Domain/Hit/AnalyzeToken.cs
+++ b/src/Nest/Domain/Hit/AnalyzeToken.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Hit/Explanation.cs b/src/Nest/Domain/Hit/Explanation.cs
index 233c536d7ad..cf0dd3a4b63 100644
--- a/src/Nest/Domain/Hit/Explanation.cs
+++ b/src/Nest/Domain/Hit/Explanation.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Hit/ExplanationDetail.cs b/src/Nest/Domain/Hit/ExplanationDetail.cs
index ca79c2550df..857be32a25c 100644
--- a/src/Nest/Domain/Hit/ExplanationDetail.cs
+++ b/src/Nest/Domain/Hit/ExplanationDetail.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Hit/Highlight.cs b/src/Nest/Domain/Hit/Highlight.cs
index d617c1ee738..e49ed55bdf4 100644
--- a/src/Nest/Domain/Hit/Highlight.cs
+++ b/src/Nest/Domain/Hit/Highlight.cs
@@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Hit/Hit.cs b/src/Nest/Domain/Hit/Hit.cs
index b19bd9b5672..75fa951a1a5 100644
--- a/src/Nest/Domain/Hit/Hit.cs
+++ b/src/Nest/Domain/Hit/Hit.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Domain;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/Domain/Hit/MultiGetHit.cs b/src/Nest/Domain/Hit/MultiGetHit.cs
index 17c7f6eaa1f..dde11f7e2fc 100644
--- a/src/Nest/Domain/Hit/MultiGetHit.cs
+++ b/src/Nest/Domain/Hit/MultiGetHit.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using Nest.Domain;
 
diff --git a/src/Nest/Domain/Hit/MultiHit.cs b/src/Nest/Domain/Hit/MultiHit.cs
index cf044024bd2..c8b526f8a17 100644
--- a/src/Nest/Domain/Hit/MultiHit.cs
+++ b/src/Nest/Domain/Hit/MultiHit.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Hit/ValidationExplanation.cs b/src/Nest/Domain/Hit/ValidationExplanation.cs
index 06ab3c3ed19..14bb3d662ad 100644
--- a/src/Nest/Domain/Hit/ValidationExplanation.cs
+++ b/src/Nest/Domain/Hit/ValidationExplanation.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Mapping/Attributes/ElasticTypeAttribute.cs b/src/Nest/Domain/Mapping/Attributes/ElasticTypeAttribute.cs
index f9d70f5a4e0..d152578adfc 100644
--- a/src/Nest/Domain/Mapping/Attributes/ElasticTypeAttribute.cs
+++ b/src/Nest/Domain/Mapping/Attributes/ElasticTypeAttribute.cs
@@ -1,8 +1,6 @@
-using Nest.Resolvers;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Descriptors/AttachmentMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/AttachmentMappingDescriptor.cs
index 69e95878377..c5dbf999a46 100644
--- a/src/Nest/Domain/Mapping/Descriptors/AttachmentMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/AttachmentMappingDescriptor.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Linq.Expressions;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Descriptors/BinaryMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/BinaryMappingDescriptor.cs
index 0d11eafd4e1..5dd34d855a3 100644
--- a/src/Nest/Domain/Mapping/Descriptors/BinaryMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/BinaryMappingDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Descriptors/BooleanMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/BooleanMappingDescriptor.cs
index 7314bb198bf..94891315f9c 100644
--- a/src/Nest/Domain/Mapping/Descriptors/BooleanMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/BooleanMappingDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Descriptors/CompletionMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/CompletionMappingDescriptor.cs
index dc70c09b4d1..3117c8d6910 100644
--- a/src/Nest/Domain/Mapping/Descriptors/CompletionMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/CompletionMappingDescriptor.cs
@@ -1,9 +1,7 @@
-using Nest.Resolvers;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Descriptors/CorePropertiesDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/CorePropertiesDescriptor.cs
index 06773635813..b907e3ecfac 100644
--- a/src/Nest/Domain/Mapping/Descriptors/CorePropertiesDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/CorePropertiesDescriptor.cs
@@ -1,10 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
-using Nest.Resolvers.Writers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Descriptors/DateMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/DateMappingDescriptor.cs
index c0ca2d7c31a..620ffcbc2b7 100644
--- a/src/Nest/Domain/Mapping/Descriptors/DateMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/DateMappingDescriptor.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Descriptors/DynamicTemplatesDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/DynamicTemplatesDescriptor.cs
index 06017c104dc..0b1107b8249 100644
--- a/src/Nest/Domain/Mapping/Descriptors/DynamicTemplatesDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/DynamicTemplatesDescriptor.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq.Expressions;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Descriptors/GenericMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/GenericMappingDescriptor.cs
index dc938475283..0d27b9707e2 100644
--- a/src/Nest/Domain/Mapping/Descriptors/GenericMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/GenericMappingDescriptor.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Descriptors/IPMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/IPMappingDescriptor.cs
index 56f893754f0..8b9d611ac23 100644
--- a/src/Nest/Domain/Mapping/Descriptors/IPMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/IPMappingDescriptor.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Descriptors/MultiFieldMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/MultiFieldMappingDescriptor.cs
index 26174c1d110..d5319535ea8 100644
--- a/src/Nest/Domain/Mapping/Descriptors/MultiFieldMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/MultiFieldMappingDescriptor.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Linq.Expressions;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Descriptors/NestedObjectMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/NestedObjectMappingDescriptor.cs
index b1302a80723..df7ce804dae 100644
--- a/src/Nest/Domain/Mapping/Descriptors/NestedObjectMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/NestedObjectMappingDescriptor.cs
@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Nest.Resolvers;
-using Newtonsoft.Json;
 using Nest.Resolvers.Writers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Descriptors/NumberMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/NumberMappingDescriptor.cs
index 771aad285bc..cf12649c2e6 100644
--- a/src/Nest/Domain/Mapping/Descriptors/NumberMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/NumberMappingDescriptor.cs
@@ -1,7 +1,6 @@
 using System;
-using System.Linq.Expressions;
-using Nest.Resolvers;
-
+using System.Linq.Expressions;
+
 namespace Nest
 {
 	public class NumberMappingDescriptor<T>
diff --git a/src/Nest/Domain/Mapping/Descriptors/ObjectMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/ObjectMappingDescriptor.cs
index 598ae5dea31..9fa23e81f76 100644
--- a/src/Nest/Domain/Mapping/Descriptors/ObjectMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/ObjectMappingDescriptor.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Nest.Resolvers;
-using Elasticsearch.Net;
-using Newtonsoft.Json;
 using Nest.Resolvers.Writers;
 
 namespace Nest
diff --git a/src/Nest/Domain/Mapping/Descriptors/PropertiesDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/PropertiesDescriptor.cs
index 17151973a99..ba417a17289 100644
--- a/src/Nest/Domain/Mapping/Descriptors/PropertiesDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/PropertiesDescriptor.cs
@@ -1,11 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
-using Nest.Resolvers.Writers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Descriptors/SingleMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/SingleMappingDescriptor.cs
index 05070c6600f..5729135df81 100644
--- a/src/Nest/Domain/Mapping/Descriptors/SingleMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/SingleMappingDescriptor.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Newtonsoft.Json;
-using Nest.Resolvers.Writers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs
index c7130d5b955..a2f5305ad69 100644
--- a/src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Linq;
-using System.Linq.Expressions;
-using Nest.Resolvers;
-
+using System.Linq.Expressions;
+
 namespace Nest
 {
 	public class StringMappingDescriptor<T>
diff --git a/src/Nest/Domain/Mapping/ParentTypeMapping.cs b/src/Nest/Domain/Mapping/ParentTypeMapping.cs
index 5d66d1fac79..170c3028817 100644
--- a/src/Nest/Domain/Mapping/ParentTypeMapping.cs
+++ b/src/Nest/Domain/Mapping/ParentTypeMapping.cs
@@ -1,5 +1,4 @@
-using Nest.Resolvers;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/SpecialFields/AnalyzerFieldMapping.cs b/src/Nest/Domain/Mapping/SpecialFields/AnalyzerFieldMapping.cs
index 2afe1bb4482..596f16938d3 100644
--- a/src/Nest/Domain/Mapping/SpecialFields/AnalyzerFieldMapping.cs
+++ b/src/Nest/Domain/Mapping/SpecialFields/AnalyzerFieldMapping.cs
@@ -2,8 +2,6 @@
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/SpecialFields/BoostFieldMapping.cs b/src/Nest/Domain/Mapping/SpecialFields/BoostFieldMapping.cs
index 93a6ea697e5..e2257226b82 100644
--- a/src/Nest/Domain/Mapping/SpecialFields/BoostFieldMapping.cs
+++ b/src/Nest/Domain/Mapping/SpecialFields/BoostFieldMapping.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/SpecialFields/IdFieldMapping.cs b/src/Nest/Domain/Mapping/SpecialFields/IdFieldMapping.cs
index 6a1ede8560a..aabbf740117 100644
--- a/src/Nest/Domain/Mapping/SpecialFields/IdFieldMapping.cs
+++ b/src/Nest/Domain/Mapping/SpecialFields/IdFieldMapping.cs
@@ -1,5 +1,4 @@
-using Nest.Resolvers.Converters;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/SpecialFields/RoutingFieldMapping.cs b/src/Nest/Domain/Mapping/SpecialFields/RoutingFieldMapping.cs
index 5f58569f851..4ddd2fd5ce6 100644
--- a/src/Nest/Domain/Mapping/SpecialFields/RoutingFieldMapping.cs
+++ b/src/Nest/Domain/Mapping/SpecialFields/RoutingFieldMapping.cs
@@ -1,8 +1,6 @@
 using System;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/SpecialFields/TimestampFieldMapping.cs b/src/Nest/Domain/Mapping/SpecialFields/TimestampFieldMapping.cs
index eb51889799b..7f081b58df2 100644
--- a/src/Nest/Domain/Mapping/SpecialFields/TimestampFieldMapping.cs
+++ b/src/Nest/Domain/Mapping/SpecialFields/TimestampFieldMapping.cs
@@ -1,8 +1,6 @@
 using System;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/SpecialFields/TypeFieldMapping.cs b/src/Nest/Domain/Mapping/SpecialFields/TypeFieldMapping.cs
index c8375c2721b..92002598d72 100644
--- a/src/Nest/Domain/Mapping/SpecialFields/TypeFieldMapping.cs
+++ b/src/Nest/Domain/Mapping/SpecialFields/TypeFieldMapping.cs
@@ -1,5 +1,4 @@
-using Nest.Resolvers.Converters;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
 namespace Nest
diff --git a/src/Nest/Domain/Mapping/Types/AttachmentMapping.cs b/src/Nest/Domain/Mapping/Types/AttachmentMapping.cs
index 8e9f0bb0da8..ed51a0e1fa7 100644
--- a/src/Nest/Domain/Mapping/Types/AttachmentMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/AttachmentMapping.cs
@@ -2,8 +2,6 @@
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/BinaryMapping.cs b/src/Nest/Domain/Mapping/Types/BinaryMapping.cs
index af48b296074..039c6f26edd 100644
--- a/src/Nest/Domain/Mapping/Types/BinaryMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/BinaryMapping.cs
@@ -1,9 +1,6 @@
 using System.Collections.Generic;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/BooleanMapping.cs b/src/Nest/Domain/Mapping/Types/BooleanMapping.cs
index ca398f181d6..5a10de72940 100644
--- a/src/Nest/Domain/Mapping/Types/BooleanMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/BooleanMapping.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System;
 using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/CompletionMapping.cs b/src/Nest/Domain/Mapping/Types/CompletionMapping.cs
index 3747b6332e9..db53b1cbf7b 100644
--- a/src/Nest/Domain/Mapping/Types/CompletionMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/CompletionMapping.cs
@@ -1,9 +1,7 @@
-using Nest.Resolvers;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/DateMapping.cs b/src/Nest/Domain/Mapping/Types/DateMapping.cs
index e3abf601d6d..db1620c53ee 100644
--- a/src/Nest/Domain/Mapping/Types/DateMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/DateMapping.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System;
 using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/GenericMapping.cs b/src/Nest/Domain/Mapping/Types/GenericMapping.cs
index 1e84ade732c..ac729c61dbb 100644
--- a/src/Nest/Domain/Mapping/Types/GenericMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/GenericMapping.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/GeoPointMapping.cs b/src/Nest/Domain/Mapping/Types/GeoPointMapping.cs
index ee0d535910c..8bc56e0effe 100644
--- a/src/Nest/Domain/Mapping/Types/GeoPointMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/GeoPointMapping.cs
@@ -1,8 +1,6 @@
 using System.Collections.Generic;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/GeoShapeMapping.cs b/src/Nest/Domain/Mapping/Types/GeoShapeMapping.cs
index 3e52e88fbae..c4da4d4ddb1 100644
--- a/src/Nest/Domain/Mapping/Types/GeoShapeMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/GeoShapeMapping.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System;
 using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/IElasticCoreType.cs b/src/Nest/Domain/Mapping/Types/IElasticCoreType.cs
index 345fa209d90..96c68d6326a 100644
--- a/src/Nest/Domain/Mapping/Types/IElasticCoreType.cs
+++ b/src/Nest/Domain/Mapping/Types/IElasticCoreType.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/IElasticType.cs b/src/Nest/Domain/Mapping/Types/IElasticType.cs
index 72e166f46c7..289813c2dcc 100644
--- a/src/Nest/Domain/Mapping/Types/IElasticType.cs
+++ b/src/Nest/Domain/Mapping/Types/IElasticType.cs
@@ -1,10 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest.Resolvers.Converters;
-using Newtonsoft.Json;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/IPMapping.cs b/src/Nest/Domain/Mapping/Types/IPMapping.cs
index 1addf0699e4..eeb2b061b48 100644
--- a/src/Nest/Domain/Mapping/Types/IPMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/IPMapping.cs
@@ -2,7 +2,6 @@
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/MultiFieldMapping.cs b/src/Nest/Domain/Mapping/Types/MultiFieldMapping.cs
index fe45fdeddb3..6780dc92398 100644
--- a/src/Nest/Domain/Mapping/Types/MultiFieldMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/MultiFieldMapping.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/NestedObjectMapping.cs b/src/Nest/Domain/Mapping/Types/NestedObjectMapping.cs
index 93a1dcc3aae..3ff293929c1 100644
--- a/src/Nest/Domain/Mapping/Types/NestedObjectMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/NestedObjectMapping.cs
@@ -1,6 +1,5 @@
 using System;
 using Newtonsoft.Json;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/NumberMapping.cs b/src/Nest/Domain/Mapping/Types/NumberMapping.cs
index 3cd960db870..69a2167f3d3 100644
--- a/src/Nest/Domain/Mapping/Types/NumberMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/NumberMapping.cs
@@ -1,10 +1,8 @@
-using System.Collections.Generic;
-using Nest.Resolvers.Converters;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 using System;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
-
+using Newtonsoft.Json.Converters;
+
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
diff --git a/src/Nest/Domain/Mapping/Types/ObjectMapping.cs b/src/Nest/Domain/Mapping/Types/ObjectMapping.cs
index ddd63642d70..fef8364e914 100644
--- a/src/Nest/Domain/Mapping/Types/ObjectMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/ObjectMapping.cs
@@ -2,7 +2,6 @@
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/RootObjectMapping.cs b/src/Nest/Domain/Mapping/Types/RootObjectMapping.cs
index c02872595ca..3d6c2b395e4 100644
--- a/src/Nest/Domain/Mapping/Types/RootObjectMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/RootObjectMapping.cs
@@ -2,7 +2,6 @@
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/StringMapping.cs b/src/Nest/Domain/Mapping/Types/StringMapping.cs
index 5b4f44cb52a..a70dcca8663 100644
--- a/src/Nest/Domain/Mapping/Types/StringMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/StringMapping.cs
@@ -1,10 +1,8 @@
-using System.Collections.Generic;
-using Nest.Resolvers.Converters;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 using System;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers;
-
+using Newtonsoft.Json.Converters;
+
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
diff --git a/src/Nest/Domain/Mapping/Types/TemplateMapping.cs b/src/Nest/Domain/Mapping/Types/TemplateMapping.cs
index d95649c0bcd..5561669a09a 100644
--- a/src/Nest/Domain/Mapping/Types/TemplateMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/TemplateMapping.cs
@@ -1,7 +1,5 @@
 using System.Collections.Generic;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Mapping/Types/WarmerMapping.cs b/src/Nest/Domain/Mapping/Types/WarmerMapping.cs
index 611af445e89..510c7f4a6bc 100644
--- a/src/Nest/Domain/Mapping/Types/WarmerMapping.cs
+++ b/src/Nest/Domain/Mapping/Types/WarmerMapping.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Marker/PropertyNameMarker.cs b/src/Nest/Domain/Marker/PropertyNameMarker.cs
index 07553d80fa0..c545e978679 100644
--- a/src/Nest/Domain/Marker/PropertyNameMarker.cs
+++ b/src/Nest/Domain/Marker/PropertyNameMarker.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq.Expressions;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Paths/FieldSelection.cs b/src/Nest/Domain/Paths/FieldSelection.cs
index a630260e212..2221c2faa90 100644
--- a/src/Nest/Domain/Paths/FieldSelection.cs
+++ b/src/Nest/Domain/Paths/FieldSelection.cs
@@ -1,13 +1,10 @@
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
 
 namespace Nest.Domain
 {
diff --git a/src/Nest/Domain/RawJson.cs b/src/Nest/Domain/RawJson.cs
index 8429cb72eb6..2d266fdb91b 100644
--- a/src/Nest/Domain/RawJson.cs
+++ b/src/Nest/Domain/RawJson.cs
@@ -1,13 +1,8 @@
-using Nest.Resolvers;
-using Nest.Resolvers.Converters;
+using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/RequestParametersExtensions.Generated.cs b/src/Nest/Domain/RequestParametersExtensions.Generated.cs
index fcef97bec08..bb8df9d2ae2 100644
--- a/src/Nest/Domain/RequestParametersExtensions.Generated.cs
+++ b/src/Nest/Domain/RequestParametersExtensions.Generated.cs
@@ -2,10 +2,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Linq.Expressions;
 using Elasticsearch.Net;
-using Nest.Resolvers;
 
 ///This file contains all the typed request parameters that are generated of the client spec.
 ///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
diff --git a/src/Nest/Domain/Responses/BaseResponse.cs b/src/Nest/Domain/Responses/BaseResponse.cs
index c392ccf3ff1..620800435a1 100644
--- a/src/Nest/Domain/Responses/BaseResponse.cs
+++ b/src/Nest/Domain/Responses/BaseResponse.cs
@@ -1,10 +1,6 @@
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using Elasticsearch.Net;
-using Elasticsearch.Net.Connection;
-using Elasticsearch.Net.Exceptions;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Responses/BulkResponse.cs b/src/Nest/Domain/Responses/BulkResponse.cs
index 376d36f8766..01785a4815e 100644
--- a/src/Nest/Domain/Responses/BulkResponse.cs
+++ b/src/Nest/Domain/Responses/BulkResponse.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using Newtonsoft.Json;
 using System.Collections.Generic;
-using Nest.Resolvers.Converters;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Responses/GetAliasesResponse.cs b/src/Nest/Domain/Responses/GetAliasesResponse.cs
index e9c52599dd4..f826f595298 100644
--- a/src/Nest/Domain/Responses/GetAliasesResponse.cs
+++ b/src/Nest/Domain/Responses/GetAliasesResponse.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Responses/GetMappingResponse.cs b/src/Nest/Domain/Responses/GetMappingResponse.cs
index 36282f10758..716853bcdb5 100644
--- a/src/Nest/Domain/Responses/GetMappingResponse.cs
+++ b/src/Nest/Domain/Responses/GetMappingResponse.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Elasticsearch.Net;
-using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Responses/GetResponse.cs b/src/Nest/Domain/Responses/GetResponse.cs
index 520b9a61a7e..43320839042 100644
--- a/src/Nest/Domain/Responses/GetResponse.cs
+++ b/src/Nest/Domain/Responses/GetResponse.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using Nest.Domain;
-using Nest.Resolvers;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Responses/GetSnapshotResponse.cs b/src/Nest/Domain/Responses/GetSnapshotResponse.cs
index 5459076ac76..6b672b6909b 100644
--- a/src/Nest/Domain/Responses/GetSnapshotResponse.cs
+++ b/src/Nest/Domain/Responses/GetSnapshotResponse.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Responses/HealthResponse.cs b/src/Nest/Domain/Responses/HealthResponse.cs
index c6da03ccc64..3519587f988 100644
--- a/src/Nest/Domain/Responses/HealthResponse.cs
+++ b/src/Nest/Domain/Responses/HealthResponse.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Responses/IndexExistsResponse.cs b/src/Nest/Domain/Responses/IndexExistsResponse.cs
index 3415430f520..21d8650f94d 100644
--- a/src/Nest/Domain/Responses/IndexExistsResponse.cs
+++ b/src/Nest/Domain/Responses/IndexExistsResponse.cs
@@ -1,5 +1,4 @@
-using System.Net;
-using Elasticsearch.Net;
+using Elasticsearch.Net;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Responses/IndexSettingsResponse.cs b/src/Nest/Domain/Responses/IndexSettingsResponse.cs
index 1c8a80426ba..00b5145d5c3 100644
--- a/src/Nest/Domain/Responses/IndexSettingsResponse.cs
+++ b/src/Nest/Domain/Responses/IndexSettingsResponse.cs
@@ -1,9 +1,7 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Responses/MultiSearchResponse.cs b/src/Nest/Domain/Responses/MultiSearchResponse.cs
index 093382e7c26..148cb45e042 100644
--- a/src/Nest/Domain/Responses/MultiSearchResponse.cs
+++ b/src/Nest/Domain/Responses/MultiSearchResponse.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using Newtonsoft.Json;
 using System.Collections.Generic;
-using Nest.Resolvers.Converters;
 using Elasticsearch.Net;
 
 namespace Nest
diff --git a/src/Nest/Domain/Responses/MultiTermVectorResponse.cs b/src/Nest/Domain/Responses/MultiTermVectorResponse.cs
index 3f8de58ee4d..76b492c7f9f 100644
--- a/src/Nest/Domain/Responses/MultiTermVectorResponse.cs
+++ b/src/Nest/Domain/Responses/MultiTermVectorResponse.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Responses/NodeInfoResponse.cs b/src/Nest/Domain/Responses/NodeInfoResponse.cs
index c3c3b770a5c..c57bf0a8fbd 100644
--- a/src/Nest/Domain/Responses/NodeInfoResponse.cs
+++ b/src/Nest/Domain/Responses/NodeInfoResponse.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Responses/NodeStatsResponse.cs b/src/Nest/Domain/Responses/NodeStatsResponse.cs
index 64616412eb0..2b2a92c15e4 100644
--- a/src/Nest/Domain/Responses/NodeStatsResponse.cs
+++ b/src/Nest/Domain/Responses/NodeStatsResponse.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Responses/PercolateResponse.cs b/src/Nest/Domain/Responses/PercolateResponse.cs
index 1299a9892b2..796c309a778 100644
--- a/src/Nest/Domain/Responses/PercolateResponse.cs
+++ b/src/Nest/Domain/Responses/PercolateResponse.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Security.Cryptography.X509Certificates;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Responses/ReindexResponse.cs b/src/Nest/Domain/Responses/ReindexResponse.cs
index 91fd3d68580..d03d84a97b7 100644
--- a/src/Nest/Domain/Responses/ReindexResponse.cs
+++ b/src/Nest/Domain/Responses/ReindexResponse.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Collections.Concurrent;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Responses/RestoreResponse.cs b/src/Nest/Domain/Responses/RestoreResponse.cs
index e318161092f..70fa527d595 100644
--- a/src/Nest/Domain/Responses/RestoreResponse.cs
+++ b/src/Nest/Domain/Responses/RestoreResponse.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Responses/SearchResponse.cs b/src/Nest/Domain/Responses/SearchResponse.cs
index ffa22b30e6b..3069d141577 100644
--- a/src/Nest/Domain/Responses/SearchResponse.cs
+++ b/src/Nest/Domain/Responses/SearchResponse.cs
@@ -1,11 +1,9 @@
 using System.Collections.Generic;
 using Nest.Domain;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
 using System;
 using System.Linq;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Responses/SnapshotResponse.cs b/src/Nest/Domain/Responses/SnapshotResponse.cs
index 811cbfdd9ba..ef8f4620e9b 100644
--- a/src/Nest/Domain/Responses/SnapshotResponse.cs
+++ b/src/Nest/Domain/Responses/SnapshotResponse.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Responses/StatusResponse.cs b/src/Nest/Domain/Responses/StatusResponse.cs
index 246377eb070..7cfed76aa5b 100644
--- a/src/Nest/Domain/Responses/StatusResponse.cs
+++ b/src/Nest/Domain/Responses/StatusResponse.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Responses/TemplateResponse.cs b/src/Nest/Domain/Responses/TemplateResponse.cs
index 3eca80f79d3..96792b3e431 100644
--- a/src/Nest/Domain/Responses/TemplateResponse.cs
+++ b/src/Nest/Domain/Responses/TemplateResponse.cs
@@ -1,5 +1,4 @@
-using Nest.Resolvers.Converters;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Responses/TermVectorResponse.cs b/src/Nest/Domain/Responses/TermVectorResponse.cs
index 1e7c1850f08..041ddc6942c 100644
--- a/src/Nest/Domain/Responses/TermVectorResponse.cs
+++ b/src/Nest/Domain/Responses/TermVectorResponse.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Responses/WarmerResponse.cs b/src/Nest/Domain/Responses/WarmerResponse.cs
index 111027acd58..e19bdda1372 100644
--- a/src/Nest/Domain/Responses/WarmerResponse.cs
+++ b/src/Nest/Domain/Responses/WarmerResponse.cs
@@ -1,5 +1,4 @@
-using Nest.Resolvers.Converters;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System.Collections.Generic;
 
 namespace Nest
diff --git a/src/Nest/Domain/Settings/IndexSettings.cs b/src/Nest/Domain/Settings/IndexSettings.cs
index 442241358da..3d2ebee0741 100644
--- a/src/Nest/Domain/Settings/IndexSettings.cs
+++ b/src/Nest/Domain/Settings/IndexSettings.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.ServiceModel.Channels;
 using Newtonsoft.Json;
 using System;
 using Nest.Resolvers.Converters;
diff --git a/src/Nest/Domain/Similarity/BM25Similarity.cs b/src/Nest/Domain/Similarity/BM25Similarity.cs
index c4c24d9c24f..591f9ebbb15 100644
--- a/src/Nest/Domain/Similarity/BM25Similarity.cs
+++ b/src/Nest/Domain/Similarity/BM25Similarity.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Similarity/DFRSimilarity.cs b/src/Nest/Domain/Similarity/DFRSimilarity.cs
index 4c9ddb902f7..0c4b61d8c16 100644
--- a/src/Nest/Domain/Similarity/DFRSimilarity.cs
+++ b/src/Nest/Domain/Similarity/DFRSimilarity.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Similarity/DefaultSimilarity.cs b/src/Nest/Domain/Similarity/DefaultSimilarity.cs
index bf915cc1dcd..8313a57d1a8 100644
--- a/src/Nest/Domain/Similarity/DefaultSimilarity.cs
+++ b/src/Nest/Domain/Similarity/DefaultSimilarity.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Similarity/IBSimilarity.cs b/src/Nest/Domain/Similarity/IBSimilarity.cs
index d15493e1dbb..5aaaa04f6d1 100644
--- a/src/Nest/Domain/Similarity/IBSimilarity.cs
+++ b/src/Nest/Domain/Similarity/IBSimilarity.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Similarity/LMDirichletSimilarity.cs b/src/Nest/Domain/Similarity/LMDirichletSimilarity.cs
index 0e3d59bcaa2..84834521f76 100644
--- a/src/Nest/Domain/Similarity/LMDirichletSimilarity.cs
+++ b/src/Nest/Domain/Similarity/LMDirichletSimilarity.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Similarity/LMJelinekSimilarity.cs b/src/Nest/Domain/Similarity/LMJelinekSimilarity.cs
index a602953eb0b..606f92b76a6 100644
--- a/src/Nest/Domain/Similarity/LMJelinekSimilarity.cs
+++ b/src/Nest/Domain/Similarity/LMJelinekSimilarity.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/Similarity/SimilarityBase.cs b/src/Nest/Domain/Similarity/SimilarityBase.cs
index a83cb2c69c6..1da29d45564 100644
--- a/src/Nest/Domain/Similarity/SimilarityBase.cs
+++ b/src/Nest/Domain/Similarity/SimilarityBase.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/State/ClusterState.cs b/src/Nest/Domain/State/ClusterState.cs
index aeb28736124..a00d3d4e477 100644
--- a/src/Nest/Domain/State/ClusterState.cs
+++ b/src/Nest/Domain/State/ClusterState.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/Domain/Stats/DocStats.cs b/src/Nest/Domain/Stats/DocStats.cs
index 1cb54265c6a..5c64039faa1 100644
--- a/src/Nest/Domain/Stats/DocStats.cs
+++ b/src/Nest/Domain/Stats/DocStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/FlushStats.cs b/src/Nest/Domain/Stats/FlushStats.cs
index be8029cd620..f400161f0b5 100644
--- a/src/Nest/Domain/Stats/FlushStats.cs
+++ b/src/Nest/Domain/Stats/FlushStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/GetStats.cs b/src/Nest/Domain/Stats/GetStats.cs
index 7d7d7b81c6e..02dd63a5b4b 100644
--- a/src/Nest/Domain/Stats/GetStats.cs
+++ b/src/Nest/Domain/Stats/GetStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/IndexDocStats.cs b/src/Nest/Domain/Stats/IndexDocStats.cs
index 02287ca84a6..67e3c722019 100644
--- a/src/Nest/Domain/Stats/IndexDocStats.cs
+++ b/src/Nest/Domain/Stats/IndexDocStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/IndexHealthStats.cs b/src/Nest/Domain/Stats/IndexHealthStats.cs
index f8cc07398f3..30912ec5977 100644
--- a/src/Nest/Domain/Stats/IndexHealthStats.cs
+++ b/src/Nest/Domain/Stats/IndexHealthStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/IndexSizeStats.cs b/src/Nest/Domain/Stats/IndexSizeStats.cs
index 521dfd30a8e..d19b068a3e8 100644
--- a/src/Nest/Domain/Stats/IndexSizeStats.cs
+++ b/src/Nest/Domain/Stats/IndexSizeStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/IndexingStats.cs b/src/Nest/Domain/Stats/IndexingStats.cs
index 1f4f11062c6..b3bba40cecc 100644
--- a/src/Nest/Domain/Stats/IndexingStats.cs
+++ b/src/Nest/Domain/Stats/IndexingStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/MergesStats.cs b/src/Nest/Domain/Stats/MergesStats.cs
index c02980062b8..b4bf0f8b45e 100644
--- a/src/Nest/Domain/Stats/MergesStats.cs
+++ b/src/Nest/Domain/Stats/MergesStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/NodeInfo.cs b/src/Nest/Domain/Stats/NodeInfo.cs
index fd711a8ac1f..39b0b4d92d8 100644
--- a/src/Nest/Domain/Stats/NodeInfo.cs
+++ b/src/Nest/Domain/Stats/NodeInfo.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/Domain/Stats/NodeStats.cs b/src/Nest/Domain/Stats/NodeStats.cs
index cf0fb707f62..4704f1f4ed4 100644
--- a/src/Nest/Domain/Stats/NodeStats.cs
+++ b/src/Nest/Domain/Stats/NodeStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/RefreshStats.cs b/src/Nest/Domain/Stats/RefreshStats.cs
index c14499b43d1..73fca80bb80 100644
--- a/src/Nest/Domain/Stats/RefreshStats.cs
+++ b/src/Nest/Domain/Stats/RefreshStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/SearchStats.cs b/src/Nest/Domain/Stats/SearchStats.cs
index 20e63b664e7..71d4efafd7b 100644
--- a/src/Nest/Domain/Stats/SearchStats.cs
+++ b/src/Nest/Domain/Stats/SearchStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/ShardHealthStats.cs b/src/Nest/Domain/Stats/ShardHealthStats.cs
index 66f8a1ae506..5e3a4a0a4a7 100644
--- a/src/Nest/Domain/Stats/ShardHealthStats.cs
+++ b/src/Nest/Domain/Stats/ShardHealthStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/Stats.cs b/src/Nest/Domain/Stats/Stats.cs
index 445fb6a78c3..1b4f00685d5 100644
--- a/src/Nest/Domain/Stats/Stats.cs
+++ b/src/Nest/Domain/Stats/Stats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/StatsContainer.cs b/src/Nest/Domain/Stats/StatsContainer.cs
index eb9216e5d7e..fd3ab1be53c 100644
--- a/src/Nest/Domain/Stats/StatsContainer.cs
+++ b/src/Nest/Domain/Stats/StatsContainer.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/StoreStats.cs b/src/Nest/Domain/Stats/StoreStats.cs
index b3ba4f5f4b6..2fd4fd67568 100644
--- a/src/Nest/Domain/Stats/StoreStats.cs
+++ b/src/Nest/Domain/Stats/StoreStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/TranslogStats.cs b/src/Nest/Domain/Stats/TranslogStats.cs
index 9d0ad501e5d..5aa183d852b 100644
--- a/src/Nest/Domain/Stats/TranslogStats.cs
+++ b/src/Nest/Domain/Stats/TranslogStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Stats/TypeStats.cs b/src/Nest/Domain/Stats/TypeStats.cs
index 622eba6dc2e..a642ff598bb 100644
--- a/src/Nest/Domain/Stats/TypeStats.cs
+++ b/src/Nest/Domain/Stats/TypeStats.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/Status/IndexStatus.cs b/src/Nest/Domain/Status/IndexStatus.cs
index 829b98af2d8..cd189e5252e 100644
--- a/src/Nest/Domain/Status/IndexStatus.cs
+++ b/src/Nest/Domain/Status/IndexStatus.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/TermVector/FieldStatistics.cs b/src/Nest/Domain/TermVector/FieldStatistics.cs
index 1e98deb5825..1f89be23ed1 100644
--- a/src/Nest/Domain/TermVector/FieldStatistics.cs
+++ b/src/Nest/Domain/TermVector/FieldStatistics.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/TermVector/MultiTermVectorDocument.cs b/src/Nest/Domain/TermVector/MultiTermVectorDocument.cs
index 9e4ee5c1b9e..ce94feb080e 100644
--- a/src/Nest/Domain/TermVector/MultiTermVectorDocument.cs
+++ b/src/Nest/Domain/TermVector/MultiTermVectorDocument.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/TermVector/TermVector.cs b/src/Nest/Domain/TermVector/TermVector.cs
index 90b66472933..97487749de4 100644
--- a/src/Nest/Domain/TermVector/TermVector.cs
+++ b/src/Nest/Domain/TermVector/TermVector.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/TermVector/TermVectorTerm.cs b/src/Nest/Domain/TermVector/TermVectorTerm.cs
index d05d88b1ebe..a5e256929a0 100644
--- a/src/Nest/Domain/TermVector/TermVectorTerm.cs
+++ b/src/Nest/Domain/TermVector/TermVectorTerm.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Domain/TermVector/Token.cs b/src/Nest/Domain/TermVector/Token.cs
index e6f31861362..5aecda64470 100644
--- a/src/Nest/Domain/TermVector/Token.cs
+++ b/src/Nest/Domain/TermVector/Token.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/ElasticClient-Bulk.cs b/src/Nest/ElasticClient-Bulk.cs
index fcab1d8677f..d6ed4b6c919 100644
--- a/src/Nest/ElasticClient-Bulk.cs
+++ b/src/Nest/ElasticClient-Bulk.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
diff --git a/src/Nest/ElasticClient-ClusterHealth.cs b/src/Nest/ElasticClient-ClusterHealth.cs
index bc20bade804..79a0b2453ed 100644
--- a/src/Nest/ElasticClient-ClusterHealth.cs
+++ b/src/Nest/ElasticClient-ClusterHealth.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
diff --git a/src/Nest/ElasticClient-ClusterSettings.cs b/src/Nest/ElasticClient-ClusterSettings.cs
index 90e77de6dde..d561c25c047 100644
--- a/src/Nest/ElasticClient-ClusterSettings.cs
+++ b/src/Nest/ElasticClient-ClusterSettings.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
diff --git a/src/Nest/ElasticClient-CreateIndex.cs b/src/Nest/ElasticClient-CreateIndex.cs
index 905f39d40c3..533da9de805 100644
--- a/src/Nest/ElasticClient-CreateIndex.cs
+++ b/src/Nest/ElasticClient-CreateIndex.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
diff --git a/src/Nest/ElasticClient-DeleteIndex.cs b/src/Nest/ElasticClient-DeleteIndex.cs
index b8a78694671..9d806a95bef 100644
--- a/src/Nest/ElasticClient-DeleteIndex.cs
+++ b/src/Nest/ElasticClient-DeleteIndex.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
diff --git a/src/Nest/ElasticClient-IndexSettings.cs b/src/Nest/ElasticClient-IndexSettings.cs
index 9d9f78fdda8..2b6e31ce56a 100644
--- a/src/Nest/ElasticClient-IndexSettings.cs
+++ b/src/Nest/ElasticClient-IndexSettings.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
diff --git a/src/Nest/ElasticClient-MultiSearch.cs b/src/Nest/ElasticClient-MultiSearch.cs
index 21e8c6d271b..e74319b1624 100644
--- a/src/Nest/ElasticClient-MultiSearch.cs
+++ b/src/Nest/ElasticClient-MultiSearch.cs
@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 using Nest.Resolvers.Converters;
diff --git a/src/Nest/ElasticClient-MultiTermVectors.cs b/src/Nest/ElasticClient-MultiTermVectors.cs
index 5d892df1f87..6909d282213 100644
--- a/src/Nest/ElasticClient-MultiTermVectors.cs
+++ b/src/Nest/ElasticClient-MultiTermVectors.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
diff --git a/src/Nest/ElasticClient-Nodes.cs b/src/Nest/ElasticClient-Nodes.cs
index 8f4a7fe2b99..4f6832a04a2 100644
--- a/src/Nest/ElasticClient-Nodes.cs
+++ b/src/Nest/ElasticClient-Nodes.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
diff --git a/src/Nest/ElasticClient-Reindex.cs b/src/Nest/ElasticClient-Reindex.cs
index 679273f6340..e79ae357abf 100644
--- a/src/Nest/ElasticClient-Reindex.cs
+++ b/src/Nest/ElasticClient-Reindex.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/ElasticClient-Repository.cs b/src/Nest/ElasticClient-Repository.cs
index e96452ab1e2..c01b2b7fb9c 100644
--- a/src/Nest/ElasticClient-Repository.cs
+++ b/src/Nest/ElasticClient-Repository.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Deployment.Internal;
 using System.Linq;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
diff --git a/src/Nest/ElasticClient-Restore.cs b/src/Nest/ElasticClient-Restore.cs
index 5efafdda6c8..95fa6f37a00 100644
--- a/src/Nest/ElasticClient-Restore.cs
+++ b/src/Nest/ElasticClient-Restore.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Deployment.Internal;
 using System.Linq;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
diff --git a/src/Nest/ElasticClient-Search.cs b/src/Nest/ElasticClient-Search.cs
index 8ad6eabc1ff..8d1dc2f6e53 100644
--- a/src/Nest/ElasticClient-Search.cs
+++ b/src/Nest/ElasticClient-Search.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Security.Cryptography;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/ElasticClient-Snapshot.cs b/src/Nest/ElasticClient-Snapshot.cs
index 659f0619afe..4a092077368 100644
--- a/src/Nest/ElasticClient-Snapshot.cs
+++ b/src/Nest/ElasticClient-Snapshot.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Deployment.Internal;
 using System.Linq;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
diff --git a/src/Nest/ElasticClient-Status.cs b/src/Nest/ElasticClient-Status.cs
index d3640484449..31a112e7fb1 100644
--- a/src/Nest/ElasticClient-Status.cs
+++ b/src/Nest/ElasticClient-Status.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
diff --git a/src/Nest/ElasticClient-TermVector.cs b/src/Nest/ElasticClient-TermVector.cs
index be3a2f781e1..0199a8b2da6 100644
--- a/src/Nest/ElasticClient-TermVector.cs
+++ b/src/Nest/ElasticClient-TermVector.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
diff --git a/src/Nest/ElasticClient-UpdateSettings.cs b/src/Nest/ElasticClient-UpdateSettings.cs
index f01dd972e80..ddb4206bc33 100644
--- a/src/Nest/ElasticClient-UpdateSettings.cs
+++ b/src/Nest/ElasticClient-UpdateSettings.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
diff --git a/src/Nest/ElasticClient.cs b/src/Nest/ElasticClient.cs
index 3c838af461d..5913ab1e8d3 100644
--- a/src/Nest/ElasticClient.cs
+++ b/src/Nest/ElasticClient.cs
@@ -1,15 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Cryptography;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 using Elasticsearch.Net.Connection;
-using Elasticsearch.Net.Connection.Configuration;
-using Nest.Resolvers.Converters;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Enums/FieldType.cs b/src/Nest/Enums/FieldType.cs
index 893d442e467..207bad606f7 100644
--- a/src/Nest/Enums/FieldType.cs
+++ b/src/Nest/Enums/FieldType.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
diff --git a/src/Nest/Enums/GeoExecution.cs b/src/Nest/Enums/GeoExecution.cs
index bf8d9039432..d52e7eda87b 100644
--- a/src/Nest/Enums/GeoExecution.cs
+++ b/src/Nest/Enums/GeoExecution.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.Linq.Expressions;
 
 namespace Nest
 {
diff --git a/src/Nest/Enums/GeoHashPrecision.cs b/src/Nest/Enums/GeoHashPrecision.cs
index da4179757bb..90d0b78aeda 100644
--- a/src/Nest/Enums/GeoHashPrecision.cs
+++ b/src/Nest/Enums/GeoHashPrecision.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Enums/GeoOptimizeBBox.cs b/src/Nest/Enums/GeoOptimizeBBox.cs
index 93f8a63eabe..2bd6b51008e 100644
--- a/src/Nest/Enums/GeoOptimizeBBox.cs
+++ b/src/Nest/Enums/GeoOptimizeBBox.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.Linq.Expressions;
 
 namespace Nest
 {
diff --git a/src/Nest/Enums/NestedScore.cs b/src/Nest/Enums/NestedScore.cs
index 92a6bfd7ab2..42cf3d7f310 100644
--- a/src/Nest/Enums/NestedScore.cs
+++ b/src/Nest/Enums/NestedScore.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using System.Runtime.Serialization;
 using Newtonsoft.Json.Converters;
diff --git a/src/Nest/Enums/RewriteMultiTerm.cs b/src/Nest/Enums/RewriteMultiTerm.cs
index 6e6d4b5627c..d716529ea8b 100644
--- a/src/Nest/Enums/RewriteMultiTerm.cs
+++ b/src/Nest/Enums/RewriteMultiTerm.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using System.Runtime.Serialization;
diff --git a/src/Nest/Enums/RoutingAllocationEnableOption.cs b/src/Nest/Enums/RoutingAllocationEnableOption.cs
index 76dc8eea134..6fda12f8363 100644
--- a/src/Nest/Enums/RoutingAllocationEnableOption.cs
+++ b/src/Nest/Enums/RoutingAllocationEnableOption.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Enums/TermVectorOption.cs b/src/Nest/Enums/TermVectorOption.cs
index 4cb4b2da8d4..a6bc61fca1e 100644
--- a/src/Nest/Enums/TermVectorOption.cs
+++ b/src/Nest/Enums/TermVectorOption.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using System.Runtime.Serialization;
diff --git a/src/Nest/Enums/TopChildrenScore.cs b/src/Nest/Enums/TopChildrenScore.cs
index 1f2280995ee..933feda23b8 100644
--- a/src/Nest/Enums/TopChildrenScore.cs
+++ b/src/Nest/Enums/TopChildrenScore.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using System.Runtime.Serialization;
 using Newtonsoft.Json.Converters;
diff --git a/src/Nest/ExposedInternals/ElasticInferrer.cs b/src/Nest/ExposedInternals/ElasticInferrer.cs
index 56ab029452d..720922c24fd 100644
--- a/src/Nest/ExposedInternals/ElasticInferrer.cs
+++ b/src/Nest/ExposedInternals/ElasticInferrer.cs
@@ -3,9 +3,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.Remoting.Messaging;
-using System.Text;
-using Elasticsearch.Net;
 using Nest.Resolvers;
 
 namespace Nest
diff --git a/src/Nest/ExposedInternals/INestSerializer.cs b/src/Nest/ExposedInternals/INestSerializer.cs
index 045884bb8ca..9a435a7c894 100644
--- a/src/Nest/ExposedInternals/INestSerializer.cs
+++ b/src/Nest/ExposedInternals/INestSerializer.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net.Serialization;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/ExposedInternals/NestSerializer.cs b/src/Nest/ExposedInternals/NestSerializer.cs
index 15557b70074..cd1ead1d3a2 100644
--- a/src/Nest/ExposedInternals/NestSerializer.cs
+++ b/src/Nest/ExposedInternals/NestSerializer.cs
@@ -2,13 +2,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 using Elasticsearch.Net.Serialization;
 using Nest.Resolvers;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
 namespace Nest
diff --git a/src/Nest/Extensions/Extensions.cs b/src/Nest/Extensions/Extensions.cs
index 4dfec780d99..871667d0bb4 100644
--- a/src/Nest/Extensions/Extensions.cs
+++ b/src/Nest/Extensions/Extensions.cs
@@ -1,14 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
+using System.Globalization;
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
-using System.Linq.Expressions;
 using Newtonsoft.Json.Linq;
-using System.Collections;
-using System.Globalization;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/Extensions/SuffixExtensions.cs b/src/Nest/Extensions/SuffixExtensions.cs
index 928f01d8732..e1b457187a8 100644
--- a/src/Nest/Extensions/SuffixExtensions.cs
+++ b/src/Nest/Extensions/SuffixExtensions.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest
 {
diff --git a/src/Nest/Extensions/TypeExtensions.cs b/src/Nest/Extensions/TypeExtensions.cs
index e6ec725af01..38e12fd0b82 100644
--- a/src/Nest/Extensions/TypeExtensions.cs
+++ b/src/Nest/Extensions/TypeExtensions.cs
@@ -4,8 +4,6 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Text;
-using Elasticsearch.Net.Connection;
 
 namespace Nest
 {
diff --git a/src/Nest/Properties/InternalsVisibleTo.cs b/src/Nest/Properties/InternalsVisibleTo.cs
index 4cedfd58ea9..06d9a4dfc03 100644
--- a/src/Nest/Properties/InternalsVisibleTo.cs
+++ b/src/Nest/Properties/InternalsVisibleTo.cs
@@ -9,10 +9,7 @@
 //------------------------------------------------------------------------------
 
 using System;
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
+
 //[assembly: InternalsVisibleTo("Nest.Tests.Unit")]
 //[assembly: InternalsVisibleTo("Nest.Tests.Integration")]
 //[assembly: InternalsVisibleTo("Nest.Connection.Thrift")]
diff --git a/src/Nest/RawDispatch.cs b/src/Nest/RawDispatch.cs
index 553d670639a..0f7e6cab081 100644
--- a/src/Nest/RawDispatch.cs
+++ b/src/Nest/RawDispatch.cs
@@ -1,14 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Threading.Tasks;
 using Elasticsearch.Net;
-using Nest.Resolvers.Converters;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
-using Nest.Resolvers;
 
 namespace Nest
 {
diff --git a/src/Nest/RawDispatch.generated.cs b/src/Nest/RawDispatch.generated.cs
index d082382b750..a8ce8a9c130 100644
--- a/src/Nest/RawDispatch.generated.cs
+++ b/src/Nest/RawDispatch.generated.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
 
diff --git a/src/Nest/Resolvers/Converters/Aggregations/FilterAggregatorConverter.cs b/src/Nest/Resolvers/Converters/Aggregations/FilterAggregatorConverter.cs
index dc0c3ae28c1..7572f768880 100644
--- a/src/Nest/Resolvers/Converters/Aggregations/FilterAggregatorConverter.cs
+++ b/src/Nest/Resolvers/Converters/Aggregations/FilterAggregatorConverter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest.Resolvers.Converters.Aggregations
diff --git a/src/Nest/Resolvers/Converters/BulkOperationResponseItemConverter.cs b/src/Nest/Resolvers/Converters/BulkOperationResponseItemConverter.cs
index bfd7613208b..2621bec8e85 100644
--- a/src/Nest/Resolvers/Converters/BulkOperationResponseItemConverter.cs
+++ b/src/Nest/Resolvers/Converters/BulkOperationResponseItemConverter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Nest.Resolvers.Converters
 {
diff --git a/src/Nest/Resolvers/Converters/ConcreteTypeConverter.cs b/src/Nest/Resolvers/Converters/ConcreteTypeConverter.cs
index 7131bc6439e..35dd1c872f6 100644
--- a/src/Nest/Resolvers/Converters/ConcreteTypeConverter.cs
+++ b/src/Nest/Resolvers/Converters/ConcreteTypeConverter.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using Elasticsearch.Net;
 using Nest.Domain;
 using Newtonsoft.Json;
diff --git a/src/Nest/Resolvers/Converters/CustomJsonConverter.cs b/src/Nest/Resolvers/Converters/CustomJsonConverter.cs
index 512fcd04068..c5bb6ab1412 100644
--- a/src/Nest/Resolvers/Converters/CustomJsonConverter.cs
+++ b/src/Nest/Resolvers/Converters/CustomJsonConverter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 
diff --git a/src/Nest/Resolvers/Converters/DictionaryKeysAreNotPropertyNamesJsonConverter.cs b/src/Nest/Resolvers/Converters/DictionaryKeysAreNotPropertyNamesJsonConverter.cs
index fac420e0c76..12a27fa2c56 100644
--- a/src/Nest/Resolvers/Converters/DictionaryKeysAreNotPropertyNamesJsonConverter.cs
+++ b/src/Nest/Resolvers/Converters/DictionaryKeysAreNotPropertyNamesJsonConverter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Globalization;
-using Elasticsearch.Net;
 using Nest.Resolvers;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/Resolvers/Converters/DynamicMappingOptionConverter.cs b/src/Nest/Resolvers/Converters/DynamicMappingOptionConverter.cs
index aa506fe72fd..5df096da556 100644
--- a/src/Nest/Resolvers/Converters/DynamicMappingOptionConverter.cs
+++ b/src/Nest/Resolvers/Converters/DynamicMappingOptionConverter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest.Resolvers.Converters
diff --git a/src/Nest/Resolvers/Converters/DynamicTemplatesConverter.cs b/src/Nest/Resolvers/Converters/DynamicTemplatesConverter.cs
index e8d347662da..61adfecf5ea 100644
--- a/src/Nest/Resolvers/Converters/DynamicTemplatesConverter.cs
+++ b/src/Nest/Resolvers/Converters/DynamicTemplatesConverter.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Elasticsearch.Net;
 
 namespace Nest.Resolvers.Converters
 {
diff --git a/src/Nest/Resolvers/Converters/FieldNameFilterConverter.cs b/src/Nest/Resolvers/Converters/FieldNameFilterConverter.cs
index 6bf6208f07e..9df60466cb3 100644
--- a/src/Nest/Resolvers/Converters/FieldNameFilterConverter.cs
+++ b/src/Nest/Resolvers/Converters/FieldNameFilterConverter.cs
@@ -1,10 +1,6 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
-using Elasticsearch.Net;
-using Nest.DSL.Query.Behaviour;
 using Nest.Resolvers;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
diff --git a/src/Nest/Resolvers/Converters/FieldNameQueryConverter.cs b/src/Nest/Resolvers/Converters/FieldNameQueryConverter.cs
index 1a4d1d006b1..061be94dacc 100644
--- a/src/Nest/Resolvers/Converters/FieldNameQueryConverter.cs
+++ b/src/Nest/Resolvers/Converters/FieldNameQueryConverter.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections;
-using System.Globalization;
-using Elasticsearch.Net;
 using Nest.DSL.Query.Behaviour;
 using Nest.Resolvers;
 using Nest.Resolvers.Converters;
diff --git a/src/Nest/Resolvers/Converters/Filters/GeoBoundingFilterConverter.cs b/src/Nest/Resolvers/Converters/Filters/GeoBoundingFilterConverter.cs
index b17ff1f90ef..a14899bc02a 100644
--- a/src/Nest/Resolvers/Converters/Filters/GeoBoundingFilterConverter.cs
+++ b/src/Nest/Resolvers/Converters/Filters/GeoBoundingFilterConverter.cs
@@ -1,9 +1,7 @@
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Nest/Resolvers/Converters/Filters/GeoDistanceFilterConverter.cs b/src/Nest/Resolvers/Converters/Filters/GeoDistanceFilterConverter.cs
index b330ee40de9..15b2e81b5ba 100644
--- a/src/Nest/Resolvers/Converters/Filters/GeoDistanceFilterConverter.cs
+++ b/src/Nest/Resolvers/Converters/Filters/GeoDistanceFilterConverter.cs
@@ -1,8 +1,6 @@
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Nest/Resolvers/Converters/Filters/GeoDistanceRangeFilterConverter.cs b/src/Nest/Resolvers/Converters/Filters/GeoDistanceRangeFilterConverter.cs
index 3a1be570e88..65876da2671 100644
--- a/src/Nest/Resolvers/Converters/Filters/GeoDistanceRangeFilterConverter.cs
+++ b/src/Nest/Resolvers/Converters/Filters/GeoDistanceRangeFilterConverter.cs
@@ -1,8 +1,6 @@
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Nest/Resolvers/Converters/Filters/GeoPolygonFilterJsonReader.cs b/src/Nest/Resolvers/Converters/Filters/GeoPolygonFilterJsonReader.cs
index 4960072d9c4..cdd4ed965a5 100644
--- a/src/Nest/Resolvers/Converters/Filters/GeoPolygonFilterJsonReader.cs
+++ b/src/Nest/Resolvers/Converters/Filters/GeoPolygonFilterJsonReader.cs
@@ -1,8 +1,6 @@
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Nest/Resolvers/Converters/Filters/GeoShapeFilterJsonReader.cs b/src/Nest/Resolvers/Converters/Filters/GeoShapeFilterJsonReader.cs
index ebc5f2e6d8e..8812adebc79 100644
--- a/src/Nest/Resolvers/Converters/Filters/GeoShapeFilterJsonReader.cs
+++ b/src/Nest/Resolvers/Converters/Filters/GeoShapeFilterJsonReader.cs
@@ -1,8 +1,6 @@
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Nest/Resolvers/Converters/Filters/PrefixFilterConverter.cs b/src/Nest/Resolvers/Converters/Filters/PrefixFilterConverter.cs
index 1cb019fa478..a604562ff8e 100644
--- a/src/Nest/Resolvers/Converters/Filters/PrefixFilterConverter.cs
+++ b/src/Nest/Resolvers/Converters/Filters/PrefixFilterConverter.cs
@@ -1,8 +1,6 @@
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Nest/Resolvers/Converters/Filters/RangeFilterJsonReader.cs b/src/Nest/Resolvers/Converters/Filters/RangeFilterJsonReader.cs
index 19c9c160d5b..bfde8486e3b 100644
--- a/src/Nest/Resolvers/Converters/Filters/RangeFilterJsonReader.cs
+++ b/src/Nest/Resolvers/Converters/Filters/RangeFilterJsonReader.cs
@@ -1,9 +1,7 @@
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Nest/Resolvers/Converters/Filters/RegexpFilterJsonReader.cs b/src/Nest/Resolvers/Converters/Filters/RegexpFilterJsonReader.cs
index 7079bfabb14..3e0979759ea 100644
--- a/src/Nest/Resolvers/Converters/Filters/RegexpFilterJsonReader.cs
+++ b/src/Nest/Resolvers/Converters/Filters/RegexpFilterJsonReader.cs
@@ -1,8 +1,6 @@
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Nest/Resolvers/Converters/Filters/TermFilterConverter.cs b/src/Nest/Resolvers/Converters/Filters/TermFilterConverter.cs
index 42fe3b9f6a9..80b4629f725 100644
--- a/src/Nest/Resolvers/Converters/Filters/TermFilterConverter.cs
+++ b/src/Nest/Resolvers/Converters/Filters/TermFilterConverter.cs
@@ -1,8 +1,6 @@
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Nest/Resolvers/Converters/Filters/TermsFilterConverter.cs b/src/Nest/Resolvers/Converters/Filters/TermsFilterConverter.cs
index c33230b504d..8ff4b455da3 100644
--- a/src/Nest/Resolvers/Converters/Filters/TermsFilterConverter.cs
+++ b/src/Nest/Resolvers/Converters/Filters/TermsFilterConverter.cs
@@ -1,8 +1,6 @@
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Nest/Resolvers/Converters/FuzzinessConverter.cs b/src/Nest/Resolvers/Converters/FuzzinessConverter.cs
index 9645f1ec865..50fa1d3bd9a 100644
--- a/src/Nest/Resolvers/Converters/FuzzinessConverter.cs
+++ b/src/Nest/Resolvers/Converters/FuzzinessConverter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Nest.Resolvers.Converters
 {
diff --git a/src/Nest/Resolvers/Converters/IndexNameMarkerConverter.cs b/src/Nest/Resolvers/Converters/IndexNameMarkerConverter.cs
index 7a5164fc88e..59009edb4a1 100644
--- a/src/Nest/Resolvers/Converters/IndexNameMarkerConverter.cs
+++ b/src/Nest/Resolvers/Converters/IndexNameMarkerConverter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 
diff --git a/src/Nest/Resolvers/Converters/IndexSettingsConverter.cs b/src/Nest/Resolvers/Converters/IndexSettingsConverter.cs
index a6e5705bcf2..4605709a697 100644
--- a/src/Nest/Resolvers/Converters/IndexSettingsConverter.cs
+++ b/src/Nest/Resolvers/Converters/IndexSettingsConverter.cs
@@ -7,8 +7,6 @@
 
 namespace Nest.Resolvers.Converters
 {
-	using System.Text;
-
 	public class IndexSettingsConverter : JsonConverter
 	{
 		private void WriteSettingObject(JsonWriter writer, JObject obj)
diff --git a/src/Nest/Resolvers/Converters/IndexSettingsResponseConverter.cs b/src/Nest/Resolvers/Converters/IndexSettingsResponseConverter.cs
index ec01f485702..094e847901a 100644
--- a/src/Nest/Resolvers/Converters/IndexSettingsResponseConverter.cs
+++ b/src/Nest/Resolvers/Converters/IndexSettingsResponseConverter.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
-using Elasticsearch.Net;
 
 
 namespace Nest.Resolvers.Converters
diff --git a/src/Nest/Resolvers/Converters/MultiSearchConverter.cs b/src/Nest/Resolvers/Converters/MultiSearchConverter.cs
index 9caea35ee63..47a7920ff17 100644
--- a/src/Nest/Resolvers/Converters/MultiSearchConverter.cs
+++ b/src/Nest/Resolvers/Converters/MultiSearchConverter.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Elasticsearch.Net;
-using Elasticsearch.Net.Connection;
-using Nest.Domain;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Reflection;
diff --git a/src/Nest/Resolvers/Converters/PropertyPathMarkerConverter.cs b/src/Nest/Resolvers/Converters/PropertyPathMarkerConverter.cs
index 5085dd81cff..9e6b93723de 100644
--- a/src/Nest/Resolvers/Converters/PropertyPathMarkerConverter.cs
+++ b/src/Nest/Resolvers/Converters/PropertyPathMarkerConverter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 
diff --git a/src/Nest/Resolvers/Converters/Queries/FuzzyQueryJsonConverter.cs b/src/Nest/Resolvers/Converters/Queries/FuzzyQueryJsonConverter.cs
index a8977eb2c87..b24a0ad66f1 100644
--- a/src/Nest/Resolvers/Converters/Queries/FuzzyQueryJsonConverter.cs
+++ b/src/Nest/Resolvers/Converters/Queries/FuzzyQueryJsonConverter.cs
@@ -1,12 +1,7 @@
 using System;
-using System.Collections;
-using System.Diagnostics.Eventing.Reader;
-using System.Globalization;
 using System.Linq;
-using Elasticsearch.Net;
 using Nest.DSL.Query.Behaviour;
 using Nest.Resolvers;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Nest/Resolvers/Converters/Queries/MatchQueryJsonConverter.cs b/src/Nest/Resolvers/Converters/Queries/MatchQueryJsonConverter.cs
index b298182389f..82c8420f423 100644
--- a/src/Nest/Resolvers/Converters/Queries/MatchQueryJsonConverter.cs
+++ b/src/Nest/Resolvers/Converters/Queries/MatchQueryJsonConverter.cs
@@ -1,12 +1,7 @@
 using System;
-using System.Collections;
-using System.Diagnostics.Eventing.Reader;
-using System.Globalization;
 using System.Linq;
-using Elasticsearch.Net;
 using Nest.DSL.Query.Behaviour;
 using Nest.Resolvers;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Nest/Resolvers/Converters/Queries/SpanTermQueryConverter.cs b/src/Nest/Resolvers/Converters/Queries/SpanTermQueryConverter.cs
index 88441759b19..6c1a3543ae3 100644
--- a/src/Nest/Resolvers/Converters/Queries/SpanTermQueryConverter.cs
+++ b/src/Nest/Resolvers/Converters/Queries/SpanTermQueryConverter.cs
@@ -1,12 +1,7 @@
 using System;
-using System.Collections;
-using System.Diagnostics.Eventing.Reader;
-using System.Globalization;
 using System.Linq;
-using Elasticsearch.Net;
 using Nest.DSL.Query.Behaviour;
 using Nest.Resolvers;
-using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Nest/Resolvers/Converters/Queries/TermsQueryJsonConverter.cs b/src/Nest/Resolvers/Converters/Queries/TermsQueryJsonConverter.cs
index 8599dd035db..16a4865b7af 100644
--- a/src/Nest/Resolvers/Converters/Queries/TermsQueryJsonConverter.cs
+++ b/src/Nest/Resolvers/Converters/Queries/TermsQueryJsonConverter.cs
@@ -1,8 +1,6 @@
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Nest/Resolvers/Converters/ReadAsTypeConverter.cs b/src/Nest/Resolvers/Converters/ReadAsTypeConverter.cs
index c6a3556719f..ec318d3777e 100644
--- a/src/Nest/Resolvers/Converters/ReadAsTypeConverter.cs
+++ b/src/Nest/Resolvers/Converters/ReadAsTypeConverter.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest.Resolvers.Converters
diff --git a/src/Nest/Resolvers/Converters/SimilarityCollectionConverter.cs b/src/Nest/Resolvers/Converters/SimilarityCollectionConverter.cs
index 8ba2dd91d04..d0ba0d5bbcd 100644
--- a/src/Nest/Resolvers/Converters/SimilarityCollectionConverter.cs
+++ b/src/Nest/Resolvers/Converters/SimilarityCollectionConverter.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest.Resolvers.Converters
 {
diff --git a/src/Nest/Resolvers/Converters/SimilaritySettingsConverter.cs b/src/Nest/Resolvers/Converters/SimilaritySettingsConverter.cs
index 00a8d3505c4..f7aaa42a37a 100644
--- a/src/Nest/Resolvers/Converters/SimilaritySettingsConverter.cs
+++ b/src/Nest/Resolvers/Converters/SimilaritySettingsConverter.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest.Resolvers.Converters
 {
diff --git a/src/Nest/Resolvers/Converters/SuggestResponseConverter.cs b/src/Nest/Resolvers/Converters/SuggestResponseConverter.cs
index 11ccb19c188..e113e393108 100644
--- a/src/Nest/Resolvers/Converters/SuggestResponseConverter.cs
+++ b/src/Nest/Resolvers/Converters/SuggestResponseConverter.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Elasticsearch.Net;
-using Elasticsearch.Net.Connection;
-using Nest.Domain;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System.Reflection;
 
 namespace Nest.Resolvers.Converters
 {
diff --git a/src/Nest/Resolvers/Converters/TypeNameMarkerConverter.cs b/src/Nest/Resolvers/Converters/TypeNameMarkerConverter.cs
index 35f5efbb39e..3dd27634bf1 100644
--- a/src/Nest/Resolvers/Converters/TypeNameMarkerConverter.cs
+++ b/src/Nest/Resolvers/Converters/TypeNameMarkerConverter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 
diff --git a/src/Nest/Resolvers/Converters/YesNoBoolConverter.cs b/src/Nest/Resolvers/Converters/YesNoBoolConverter.cs
index a790f6b5708..11368f4d335 100644
--- a/src/Nest/Resolvers/Converters/YesNoBoolConverter.cs
+++ b/src/Nest/Resolvers/Converters/YesNoBoolConverter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Nest.Resolvers.Converters
diff --git a/src/Nest/Resolvers/ExpressionVisitor.cs b/src/Nest/Resolvers/ExpressionVisitor.cs
index 1d807017498..f0f8ebf8364 100644
--- a/src/Nest/Resolvers/ExpressionVisitor.cs
+++ b/src/Nest/Resolvers/ExpressionVisitor.cs
@@ -2,10 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text;
 using System.Linq.Expressions;
-using System.Reflection;
-using System.Runtime.CompilerServices;
 
 namespace Nest.Resolvers
 {
diff --git a/src/Nest/Resolvers/IdResolver.cs b/src/Nest/Resolvers/IdResolver.cs
index 384241a8361..e6ea5de5a82 100644
--- a/src/Nest/Resolvers/IdResolver.cs
+++ b/src/Nest/Resolvers/IdResolver.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Collections.Concurrent;
 using System.Reflection;
 
diff --git a/src/Nest/Resolvers/IndexNameMarkerExtensions.cs b/src/Nest/Resolvers/IndexNameMarkerExtensions.cs
index dd1674404d7..b2b5d197631 100644
--- a/src/Nest/Resolvers/IndexNameMarkerExtensions.cs
+++ b/src/Nest/Resolvers/IndexNameMarkerExtensions.cs
@@ -1,5 +1,4 @@
 using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest
 {
diff --git a/src/Nest/Resolvers/IndexNameResolver.cs b/src/Nest/Resolvers/IndexNameResolver.cs
index 60d7382d6fd..398e38789c5 100644
--- a/src/Nest/Resolvers/IndexNameResolver.cs
+++ b/src/Nest/Resolvers/IndexNameResolver.cs
@@ -1,10 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Collections.Concurrent;
-using System.Reflection;
-using Elasticsearch.Net;
 
 namespace Nest.Resolvers
 {
diff --git a/src/Nest/Resolvers/Inflector.cs b/src/Nest/Resolvers/Inflector.cs
index 0fd5be49a0f..b9614a7497e 100644
--- a/src/Nest/Resolvers/Inflector.cs
+++ b/src/Nest/Resolvers/Inflector.cs
@@ -2,7 +2,6 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using System.Threading;
 
 namespace Nest.Resolvers
 {
diff --git a/src/Nest/Resolvers/PropertyNameResolver.cs b/src/Nest/Resolvers/PropertyNameResolver.cs
index 00c4242acc9..99a695cca53 100644
--- a/src/Nest/Resolvers/PropertyNameResolver.cs
+++ b/src/Nest/Resolvers/PropertyNameResolver.cs
@@ -4,12 +4,9 @@
 using System.Linq;
 using System.Text;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 using System.Linq.Expressions;
 using System.Reflection;
-using Nest;
 using System.Runtime.CompilerServices;
-using Elasticsearch.Net;
 using System.Collections.Concurrent;
 
 namespace Nest.Resolvers
diff --git a/src/Nest/Resolvers/SettingsContractResolver.cs b/src/Nest/Resolvers/SettingsContractResolver.cs
index 92d6c2b0cbb..fb430236b3f 100644
--- a/src/Nest/Resolvers/SettingsContractResolver.cs
+++ b/src/Nest/Resolvers/SettingsContractResolver.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest.Resolvers
 {
diff --git a/src/Nest/Resolvers/TypeNameMarkerExtensions.cs b/src/Nest/Resolvers/TypeNameMarkerExtensions.cs
index 7061d007b0a..f13b56f6228 100644
--- a/src/Nest/Resolvers/TypeNameMarkerExtensions.cs
+++ b/src/Nest/Resolvers/TypeNameMarkerExtensions.cs
@@ -1,7 +1,4 @@
-using Nest.Resolvers;
-using Elasticsearch.Net;
-
-namespace Nest
+namespace Nest
 {
 	public static class TypeNameMarkerExtensions
 	{
diff --git a/src/Nest/Resolvers/TypeNameResolver.cs b/src/Nest/Resolvers/TypeNameResolver.cs
index 2620d7f6411..58c605b0ccb 100644
--- a/src/Nest/Resolvers/TypeNameResolver.cs
+++ b/src/Nest/Resolvers/TypeNameResolver.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Elasticsearch.Net;
 
 namespace Nest.Resolvers
 {
diff --git a/src/Nest/Resolvers/Writers/TypeMappingWriter.cs b/src/Nest/Resolvers/Writers/TypeMappingWriter.cs
index 7ccce954928..b6bb9e59980 100644
--- a/src/Nest/Resolvers/Writers/TypeMappingWriter.cs
+++ b/src/Nest/Resolvers/Writers/TypeMappingWriter.cs
@@ -4,7 +4,6 @@
 using System.Reflection;
 using System.Text;
 using System.IO;
-using Elasticsearch.Net;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Collections.Concurrent;
diff --git a/src/Nest/Resolvers/Writers/WritePropertiesFromAttributeVisitor.cs b/src/Nest/Resolvers/Writers/WritePropertiesFromAttributeVisitor.cs
index a56b886855e..4970309b721 100644
--- a/src/Nest/Resolvers/Writers/WritePropertiesFromAttributeVisitor.cs
+++ b/src/Nest/Resolvers/Writers/WritePropertiesFromAttributeVisitor.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Globalization;
-using Newtonsoft.Json;
-using Elasticsearch.Net;
-
+using Newtonsoft.Json;
+
 namespace Nest.Resolvers.Writers {
     public class WritePropertiesFromAttributeVisitor : IElasticPropertyVisitor
     {
diff --git a/src/Profiling/Profiling.InMemoryConnection/Program.cs b/src/Profiling/Profiling.InMemoryConnection/Program.cs
index bc8d1152602..ab8f39ab8c2 100644
--- a/src/Profiling/Profiling.InMemoryConnection/Program.cs
+++ b/src/Profiling/Profiling.InMemoryConnection/Program.cs
@@ -1,7 +1,5 @@
 using System;
-using Elasticsearch.Net.Connection;
 using Nest;
-using Elasticsearch.Net;
 
 namespace Profiling.InMemoryConnection
 {
diff --git a/src/Profiling/Profiling.Indexing/HttpTester.cs b/src/Profiling/Profiling.Indexing/HttpTester.cs
index 9f02e79353d..b176ed2836f 100644
--- a/src/Profiling/Profiling.Indexing/HttpTester.cs
+++ b/src/Profiling/Profiling.Indexing/HttpTester.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using Nest;
 
 namespace Profiling.Indexing
diff --git a/src/Profiling/Profiling.Indexing/PartitionExtension.cs b/src/Profiling/Profiling.Indexing/PartitionExtension.cs
index 34fea215f13..6ee08e9aef8 100644
--- a/src/Profiling/Profiling.Indexing/PartitionExtension.cs
+++ b/src/Profiling/Profiling.Indexing/PartitionExtension.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text;
 
 namespace Profiling.Indexing
 {
diff --git a/src/Profiling/Profiling.Indexing/Program.cs b/src/Profiling/Profiling.Indexing/Program.cs
index 08e72f1faa0..445343f9785 100644
--- a/src/Profiling/Profiling.Indexing/Program.cs
+++ b/src/Profiling/Profiling.Indexing/Program.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using Nest;
 
diff --git a/src/Profiling/Profiling.Indexing/Serializer/SsTextNestSerializer.cs b/src/Profiling/Profiling.Indexing/Serializer/SsTextNestSerializer.cs
index ff640ee3037..93c29f11be8 100644
--- a/src/Profiling/Profiling.Indexing/Serializer/SsTextNestSerializer.cs
+++ b/src/Profiling/Profiling.Indexing/Serializer/SsTextNestSerializer.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Elasticsearch.Net;
-using Elasticsearch.Net.Serialization;
 using Nest;
-using ServiceStack.Text;
 
 namespace Profiling.Indexing.Serializer
 {
diff --git a/src/Profiling/Profiling.Indexing/Tester.cs b/src/Profiling/Profiling.Indexing/Tester.cs
index 87e6800e891..a9103666957 100644
--- a/src/Profiling/Profiling.Indexing/Tester.cs
+++ b/src/Profiling/Profiling.Indexing/Tester.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Elasticsearch.Net;
 using Nest;
 
 namespace Profiling.Indexing
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/bulk/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/bulk/10_basic.yaml.cs
index 27d91dc54c8..610dcfdadac 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/bulk/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/bulk/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/bulk/20_list_of_strings.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/bulk/20_list_of_strings.yaml.cs
index c6435854e12..d3961c40ec3 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/bulk/20_list_of_strings.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/bulk/20_list_of_strings.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/bulk/30_big_string.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/bulk/30_big_string.yaml.cs
index c23f9759f75..f6abb7f7444 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/bulk/30_big_string.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/bulk/30_big_string.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.aliases/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.aliases/10_basic.yaml.cs
index a41573e9117..424c3ecdf09 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.aliases/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.aliases/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.allocation/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.allocation/10_basic.yaml.cs
index 3b8b2fa1707..200079c8ca1 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.allocation/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.allocation/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.count/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.count/10_basic.yaml.cs
index 3125f25fdd2..d57622c6284 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.count/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.count/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.fielddata/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.fielddata/10_basic.yaml.cs
index dba78fdd8bd..6411755e386 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.fielddata/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.fielddata/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.recovery/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.recovery/10_basic.yaml.cs
index e1f25062301..24be1fb35ef 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.recovery/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.recovery/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.shards/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.shards/10_basic.yaml.cs
index d21ace56245..42c07b4bcf4 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.shards/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.shards/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.thread_pool/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.thread_pool/10_basic.yaml.cs
index 5e59cf5d4a1..32afa12ab7d 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.thread_pool/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/cat.thread_pool/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.pending_tasks/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.pending_tasks/10_basic.yaml.cs
index e73609e8256..ad7a1549927 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.pending_tasks/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.pending_tasks/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.put_settings/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.put_settings/10_basic.yaml.cs
index b7139fc37a9..e0f4f73e536 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.put_settings/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.put_settings/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.reroute/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.reroute/10_basic.yaml.cs
index b963f81331c..261cf453032 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.reroute/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.reroute/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.reroute/11_explain.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.reroute/11_explain.yaml.cs
index 4ca7de4efb2..844a74e6804 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.reroute/11_explain.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.reroute/11_explain.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.state/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.state/10_basic.yaml.cs
index e32e621604b..8d58db8b51c 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.state/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.state/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.state/20_filtering.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.state/20_filtering.yaml.cs
index ea32b25c014..4c561fb3ae6 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.state/20_filtering.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.state/20_filtering.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/10_with_id.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/10_with_id.yaml.cs
index 570937d00dd..36670e66359 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/10_with_id.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/10_with_id.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/15_without_id.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/15_without_id.yaml.cs
index 25d30ced34d..efd4a75c5f4 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/15_without_id.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/15_without_id.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/30_internal_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/30_internal_version.yaml.cs
index 9b54810c628..e0d2e1b8208 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/30_internal_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/30_internal_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/35_external_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/35_external_version.yaml.cs
index 1bf6d2f07eb..5981dcc57f5 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/35_external_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/35_external_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/36_external_gte_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/36_external_gte_version.yaml.cs
index 77178e5c7b0..1803103bee7 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/36_external_gte_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/36_external_gte_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/37_force_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/37_force_version.yaml.cs
index ace0eee92fc..283ccbca04e 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/37_force_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/37_force_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/40_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/40_routing.yaml.cs
index fe1d1a17d24..d4bca747732 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/40_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/40_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/50_parent.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/50_parent.yaml.cs
index 5ea67bef08a..c3bc9d89355 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/50_parent.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/50_parent.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/55_parent_with_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/55_parent_with_routing.yaml.cs
index 2974a4e95aa..055a74babc2 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/55_parent_with_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/55_parent_with_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/60_refresh.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/60_refresh.yaml.cs
index e4d09abe36f..c91db7c9f61 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/60_refresh.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/60_refresh.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/70_timestamp.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/70_timestamp.yaml.cs
index 2987cd98363..a2607d78b98 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/70_timestamp.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/70_timestamp.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/75_ttl.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/75_ttl.yaml.cs
index 830ecbf6548..6ede22ec7d8 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/create/75_ttl.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/create/75_ttl.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/10_basic.yaml.cs
index 6cb00a27b26..a0d9ac78d3f 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/20_internal_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/20_internal_version.yaml.cs
index faabc2db648..38bff479995 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/20_internal_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/20_internal_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/25_external_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/25_external_version.yaml.cs
index af5addf91f6..b688661e487 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/25_external_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/25_external_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/26_external_gte_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/26_external_gte_version.yaml.cs
index 0aeeee0a8b7..bdaaee1c527 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/26_external_gte_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/26_external_gte_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/27_force_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/27_force_version.yaml.cs
index 0751e3f1cf6..1419e31daa7 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/27_force_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/27_force_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/30_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/30_routing.yaml.cs
index df356a136b2..5d02228dc90 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/30_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/30_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/40_parent.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/40_parent.yaml.cs
index ff547ce411b..d63bfdeafb4 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/40_parent.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/40_parent.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/45_parent_with_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/45_parent_with_routing.yaml.cs
index 21ab0ecee64..e7aea683fc3 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/45_parent_with_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/45_parent_with_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/50_refresh.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/50_refresh.yaml.cs
index 7ecc6ac36e7..68f83cbcb68 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/50_refresh.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/50_refresh.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/60_missing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/60_missing.yaml.cs
index cc464f8d067..ca380848b56 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/60_missing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete/60_missing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete_by_query/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete_by_query/10_basic.yaml.cs
index 770d44a1d5a..3740516bfb5 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/delete_by_query/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/delete_by_query/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/10_basic.yaml.cs
index 3da78330a94..c11cfa99305 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/30_parent.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/30_parent.yaml.cs
index f5045abde45..9f5315cbf06 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/30_parent.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/30_parent.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/40_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/40_routing.yaml.cs
index e126ecd6fe2..886cbc2a8a2 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/40_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/40_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/55_parent_with_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/55_parent_with_routing.yaml.cs
index d219a5350e2..af39a8b5e16 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/55_parent_with_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/55_parent_with_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/60_realtime_refresh.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/60_realtime_refresh.yaml.cs
index ee21a687545..287c48dc759 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/60_realtime_refresh.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/60_realtime_refresh.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/70_defaults.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/70_defaults.yaml.cs
index 82a7b059ba1..a37f2707f80 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/70_defaults.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/exists/70_defaults.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/explain/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/explain/10_basic.yaml.cs
index 5cf84ce0891..2b0671bc378 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/explain/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/explain/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/explain/20_source_filtering.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/explain/20_source_filtering.yaml.cs
index abcc43d407d..28bbc02b96d 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/explain/20_source_filtering.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/explain/20_source_filtering.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/10_basic.yaml.cs
index 413cb630158..3e793c0089a 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/10_basic.yaml.cs
@@ -1,9 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/15_default_values.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/15_default_values.yaml.cs
index 9a0c9e89712..ec809df1b75 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/15_default_values.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/15_default_values.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/20_fields.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/20_fields.yaml.cs
index 6c5b9b67ebf..2f074fce09d 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/20_fields.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/20_fields.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/30_parent.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/30_parent.yaml.cs
index dd6f99ac59d..e9f3ca2ca07 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/30_parent.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/30_parent.yaml.cs
@@ -1,9 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/40_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/40_routing.yaml.cs
index 5db35bc24e6..814277fb6c9 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/40_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/40_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/55_parent_with_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/55_parent_with_routing.yaml.cs
index 931824bde4c..ad6c894a3fd 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/55_parent_with_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/55_parent_with_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/60_realtime_refresh.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/60_realtime_refresh.yaml.cs
index 0a308d4e29c..3e12a1071d2 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/60_realtime_refresh.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/60_realtime_refresh.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/70_source_filtering.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/70_source_filtering.yaml.cs
index 8f7c3c3fb55..3b27f9096c1 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/70_source_filtering.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/70_source_filtering.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/80_missing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/80_missing.yaml.cs
index b41c0b46769..9c67985715d 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/80_missing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/80_missing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/90_versions.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/90_versions.yaml.cs
index 1793b38b1d1..e6dbce4c87d 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get/90_versions.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get/90_versions.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/10_basic.yaml.cs
index 8b26b02fa8c..2a1eb8a2fa6 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/15_default_values.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/15_default_values.yaml.cs
index aebd76c3d27..d02f0b69654 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/15_default_values.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/15_default_values.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/30_parent.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/30_parent.yaml.cs
index 3477630d305..7987801ab0c 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/30_parent.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/30_parent.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/40_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/40_routing.yaml.cs
index 38517cd9728..2b4734b407b 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/40_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/40_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/55_parent_with_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/55_parent_with_routing.yaml.cs
index e33a5922665..9376d11d70d 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/55_parent_with_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/55_parent_with_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/60_realtime_refresh.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/60_realtime_refresh.yaml.cs
index e67139f128a..ac177719217 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/60_realtime_refresh.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/60_realtime_refresh.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/70_source_filtering.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/70_source_filtering.yaml.cs
index 5cf98206d14..ba1a10f86c8 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/70_source_filtering.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/70_source_filtering.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/80_missing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/80_missing.yaml.cs
index 4922fd899ec..e50c3311151 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/80_missing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/get_source/80_missing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/10_with_id.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/10_with_id.yaml.cs
index 9e8c637262f..362d9e9f6cc 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/10_with_id.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/10_with_id.yaml.cs
@@ -1,9 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/15_without_id.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/15_without_id.yaml.cs
index db22e9054a8..7abcade5834 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/15_without_id.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/15_without_id.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/20_optype.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/20_optype.yaml.cs
index d2cce1015bc..848493ecb5f 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/20_optype.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/20_optype.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/30_internal_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/30_internal_version.yaml.cs
index 29f2e55645e..3791c3131a1 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/30_internal_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/30_internal_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/35_external_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/35_external_version.yaml.cs
index 988a57bfc6c..37c6f0f3079 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/35_external_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/35_external_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/36_external_gte_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/36_external_gte_version.yaml.cs
index 429fb588ffb..b6568605997 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/36_external_gte_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/36_external_gte_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/37_force_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/37_force_version.yaml.cs
index 4c5becf1ad8..c609160a5a6 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/37_force_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/37_force_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/40_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/40_routing.yaml.cs
index d7082ad1e28..4a408ec3289 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/40_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/40_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/50_parent.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/50_parent.yaml.cs
index 5fd29f7bd2b..66bfefa9e3e 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/50_parent.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/50_parent.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/55_parent_with_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/55_parent_with_routing.yaml.cs
index cef8978bb51..1c933cd5728 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/55_parent_with_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/55_parent_with_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/60_refresh.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/60_refresh.yaml.cs
index a6b5c17a650..5b851fc6330 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/60_refresh.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/60_refresh.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/70_timestamp.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/70_timestamp.yaml.cs
index 82122a2f05a..732bf2514c0 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/70_timestamp.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/70_timestamp.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/75_ttl.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/75_ttl.yaml.cs
index f26c24241cb..6621bfa4c9c 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/index/75_ttl.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/index/75_ttl.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.analyze/10_analyze.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.analyze/10_analyze.yaml.cs
index b8bdbe8e290..d8ee7570ac5 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.analyze/10_analyze.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.analyze/10_analyze.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.clear_cache/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.clear_cache/10_basic.yaml.cs
index 6da8ce6b0ff..a18e6b66761 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.clear_cache/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.clear_cache/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.create/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.create/10_basic.yaml.cs
index 83aa5f07057..97fa6c44d86 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.create/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.create/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_alias/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_alias/10_basic.yaml.cs
index 1b5d26174d8..7e036e7268e 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_alias/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_alias/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_alias/all_path_options.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_alias/all_path_options.yaml.cs
index b203ed0a25c..4add3aa1677 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_alias/all_path_options.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_alias/all_path_options.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_mapping/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_mapping/10_basic.yaml.cs
index efda091c9bb..a3f11782706 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_mapping/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_mapping/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_mapping/all_path_options.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_mapping/all_path_options.yaml.cs
index f15c45878bb..a1622520726 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_mapping/all_path_options.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_mapping/all_path_options.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_warmer/all_path_options.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_warmer/all_path_options.yaml.cs
index 241a20bcc98..3d0364a954c 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_warmer/all_path_options.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.delete_warmer/all_path_options.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists/10_basic.yaml.cs
index 2468da353b3..36df1d3978f 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists_alias/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists_alias/10_basic.yaml.cs
index b6a421a74bc..11146c6f64f 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists_alias/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists_alias/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists_template/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists_template/10_basic.yaml.cs
index 4793960a4e7..9cdb433a09e 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists_template/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists_template/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists_type/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists_type/10_basic.yaml.cs
index 23b17a00231..8e3e6cad2a3 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists_type/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.exists_type/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_alias/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_alias/10_basic.yaml.cs
index 7f2b7f35cc2..9d7c0c9f79c 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_alias/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_alias/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_aliases/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_aliases/10_basic.yaml.cs
index d639ea0aa64..12ca30b9f78 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_aliases/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_aliases/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/10_basic.yaml.cs
index 0554a496210..66962a57468 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/20_missing_field.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/20_missing_field.yaml.cs
index 7dcca247874..b77aa28c79e 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/20_missing_field.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/20_missing_field.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/30_missing_type.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/30_missing_type.yaml.cs
index 3355b6a10ae..102dd3077da 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/30_missing_type.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/30_missing_type.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/40_missing_index.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/40_missing_index.yaml.cs
index 88556997420..b11ca8236d6 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/40_missing_index.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/40_missing_index.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/50_field_wildcards.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/50_field_wildcards.yaml.cs
index 9cc69186554..88c8357aacd 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/50_field_wildcards.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_field_mapping/50_field_wildcards.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/10_basic.yaml.cs
index f0e28363731..e247177f111 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/20_missing_type.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/20_missing_type.yaml.cs
index db5fecae1ae..92a2c5e86a4 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/20_missing_type.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/20_missing_type.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/30_missing_index.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/30_missing_index.yaml.cs
index f02b1d32ca5..dc0ff6ffd78 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/30_missing_index.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/30_missing_index.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/40_aliases.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/40_aliases.yaml.cs
index 3854f583a67..539d1c5fb7b 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/40_aliases.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_mapping/40_aliases.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_settings/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_settings/10_basic.yaml.cs
index c9b9b46c02f..7a81659493b 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_settings/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_settings/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_settings/20_aliases.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_settings/20_aliases.yaml.cs
index e0e3e9f36e8..005eda41eeb 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_settings/20_aliases.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_settings/20_aliases.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_template/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_template/10_basic.yaml.cs
index 91a4898ef91..fa17fa53b17 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_template/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_template/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_template/20_get_missing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_template/20_get_missing.yaml.cs
index f877fe5fde6..649b79283ca 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_template/20_get_missing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_template/20_get_missing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_warmer/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_warmer/10_basic.yaml.cs
index edf07ea1fe2..0549e7e57b2 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_warmer/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.get_warmer/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.open/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.open/10_basic.yaml.cs
index e00f2adb520..37b3404709d 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.open/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.open/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.open/20_multiple_indices.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.open/20_multiple_indices.yaml.cs
index fa76a0f2549..e56a9b36dbf 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.open/20_multiple_indices.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.open/20_multiple_indices.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.optimize/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.optimize/10_basic.yaml.cs
index 6b40169433b..48a4a357cd1 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.optimize/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.optimize/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_alias/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_alias/10_basic.yaml.cs
index 5efcea3e602..7bb7a0ae5b7 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_alias/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_alias/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_alias/all_path_options.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_alias/all_path_options.yaml.cs
index 3fea514656d..227f11d38f1 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_alias/all_path_options.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_alias/all_path_options.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_mapping/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_mapping/10_basic.yaml.cs
index a87f8b653eb..aeaad4a05e5 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_mapping/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_mapping/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_mapping/all_path_options.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_mapping/all_path_options.yaml.cs
index 31989550f97..09dd2d2e20c 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_mapping/all_path_options.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_mapping/all_path_options.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_settings/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_settings/10_basic.yaml.cs
index 7b5add58389..d0dcc1707ee 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_settings/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_settings/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_settings/all_path_options.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_settings/all_path_options.yaml.cs
index ea4e493508d..cdb26694d61 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_settings/all_path_options.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_settings/all_path_options.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_template/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_template/10_basic.yaml.cs
index cc98416e139..2b9756041d5 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_template/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_template/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_warmer/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_warmer/10_basic.yaml.cs
index 6c4f94602ef..a280852ca83 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_warmer/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_warmer/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_warmer/20_aliases.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_warmer/20_aliases.yaml.cs
index 0242f0637d5..519dea35270 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_warmer/20_aliases.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_warmer/20_aliases.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_warmer/all_path_options.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_warmer/all_path_options.yaml.cs
index a8fb93db50e..6b7eaeab60c 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_warmer/all_path_options.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.put_warmer/all_path_options.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.recovery/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.recovery/10_basic.yaml.cs
index c2378d54cb6..d31a4b230e5 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.recovery/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.recovery/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.segments/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.segments/10_basic.yaml.cs
index c67e7f457a8..e906dcdc7fc 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.segments/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.segments/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.snapshot_index/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.snapshot_index/10_basic.yaml.cs
index 0732c4b1310..acd1cdcd89d 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.snapshot_index/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.snapshot_index/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.stats/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.stats/10_basic.yaml.cs
index a34e8cb9b9b..10c86109447 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.stats/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.stats/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.status/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.status/10_basic.yaml.cs
index 12bb95c3048..0f9599c64a8 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.status/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.status/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.update_aliases/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.update_aliases/10_basic.yaml.cs
index d0118c0da35..cfa0714112a 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.update_aliases/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.update_aliases/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.update_aliases/20_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.update_aliases/20_routing.yaml.cs
index fa4e25b9872..e74e708ea01 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.update_aliases/20_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.update_aliases/20_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.validate_query/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.validate_query/10_basic.yaml.cs
index 45ee748bf92..da3173ab541 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.validate_query/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/indices.validate_query/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/info/10_info.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/info/10_info.yaml.cs
index e596416efb9..05e3804545c 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/info/10_info.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/info/10_info.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/info/20_lucene_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/info/20_lucene_version.yaml.cs
index 273ecba6dc5..bb53ae86c07 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/info/20_lucene_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/info/20_lucene_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/10_basic.yaml.cs
index b9eb19e93ff..1840e8c9f59 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/11_default_index_type.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/11_default_index_type.yaml.cs
index 862ea911394..0b0b989a972 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/11_default_index_type.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/11_default_index_type.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/12_non_existent_index.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/12_non_existent_index.yaml.cs
index 03ef4a5080d..26aff0b14e8 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/12_non_existent_index.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/12_non_existent_index.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/13_missing_metadata.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/13_missing_metadata.yaml.cs
index e06c6725117..220724ba68e 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/13_missing_metadata.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/13_missing_metadata.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/15_ids.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/15_ids.yaml.cs
index a0e11ce96e9..88ae0ea3fbd 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/15_ids.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/15_ids.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/20_fields.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/20_fields.yaml.cs
index b0eb5c951c7..a5a2b583267 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/20_fields.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/20_fields.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/30_parent.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/30_parent.yaml.cs
index ed5d87c3b32..3d150e1fc3c 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/30_parent.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/30_parent.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/40_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/40_routing.yaml.cs
index 9f693d0d42a..2f329c0ac35 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/40_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/40_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/55_parent_with_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/55_parent_with_routing.yaml.cs
index aa4fe493ee6..229bd8ffafb 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/55_parent_with_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/55_parent_with_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/60_realtime_refresh.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/60_realtime_refresh.yaml.cs
index 71d2c43b92e..0364cf656dc 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/60_realtime_refresh.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/60_realtime_refresh.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/70_source_filtering.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/70_source_filtering.yaml.cs
index cff99e5b884..d14465a5e0b 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/70_source_filtering.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/mget/70_source_filtering.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/mlt/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/mlt/10_basic.yaml.cs
index 18807c40dc6..94db175ed62 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/mlt/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/mlt/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/mpercolate/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/mpercolate/10_basic.yaml.cs
index 5634bc48ca2..401107793ef 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/mpercolate/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/mpercolate/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/msearch/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/msearch/10_basic.yaml.cs
index e2c4585cd1e..00301624004 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/msearch/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/msearch/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/mtermvectors/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/mtermvectors/10_basic.yaml.cs
index 3639fda8613..8546d386bf9 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/mtermvectors/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/mtermvectors/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/nodes.info/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/nodes.info/10_basic.yaml.cs
index e87f07270eb..9fe70cf672a 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/nodes.info/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/nodes.info/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/nodes.stats/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/nodes.stats/10_basic.yaml.cs
index b03fae937fa..bde15f2634c 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/nodes.stats/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/nodes.stats/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/15_new.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/15_new.yaml.cs
index ea9653f9d2d..20c9fdca692 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/15_new.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/15_new.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/16_existing_doc.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/16_existing_doc.yaml.cs
index 2d87fbbbdeb..98f333a0f20 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/16_existing_doc.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/16_existing_doc.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/17_empty.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/17_empty.yaml.cs
index 33b9a12519f..a11ccc520c0 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/17_empty.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/17_empty.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/18_highligh_with_query.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/18_highligh_with_query.yaml.cs
index 1e4f83ffe68..914af2d105f 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/18_highligh_with_query.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/percolate/18_highligh_with_query.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/ping/10_ping.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/ping/10_ping.yaml.cs
index d78f4d4258f..51373322a03 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/ping/10_ping.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/ping/10_ping.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/scroll/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/scroll/10_basic.yaml.cs
index 3bd5a1cda91..826e4d882b3 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/scroll/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/scroll/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/scroll/11_clear.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/scroll/11_clear.yaml.cs
index 87cb67bd641..cc53dc011dd 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/scroll/11_clear.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/scroll/11_clear.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/search/10_source_filtering.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/search/10_source_filtering.yaml.cs
index c4de3901e33..96e391a4c9a 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/search/10_source_filtering.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/search/10_source_filtering.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/search/20_default_values.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/search/20_default_values.yaml.cs
index 213290be249..a300e722729 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/search/20_default_values.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/search/20_default_values.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/search/issue4895.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/search/issue4895.yaml.cs
index 943122293dc..65ef58717d3 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/search/issue4895.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/search/issue4895.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/snapshot.get_repository/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/snapshot.get_repository/10_basic.yaml.cs
index f576a2f5e7d..0439cb1e78c 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/snapshot.get_repository/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/snapshot.get_repository/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/suggest/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/suggest/10_basic.yaml.cs
index d04642a557c..10a909d83f0 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/suggest/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/suggest/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/suggest/20_context.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/suggest/20_context.yaml.cs
index 4df62b56929..c3e2c4ea24b 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/suggest/20_context.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/suggest/20_context.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/termvector/10_basic.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/termvector/10_basic.yaml.cs
index b172898eb78..868fc7a30e4 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/termvector/10_basic.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/termvector/10_basic.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/10_doc.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/10_doc.yaml.cs
index 5e02916594c..d9c80b3d32f 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/10_doc.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/10_doc.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/15_script.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/15_script.yaml.cs
index ca24507770f..67bb3075b86 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/15_script.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/15_script.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/20_doc_upsert.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/20_doc_upsert.yaml.cs
index 7a540e5745b..48d1aa1b3f1 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/20_doc_upsert.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/20_doc_upsert.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/22_doc_as_upsert.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/22_doc_as_upsert.yaml.cs
index 47ef215a9a2..3b07952ec44 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/22_doc_as_upsert.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/22_doc_as_upsert.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/25_script_upsert.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/25_script_upsert.yaml.cs
index d80f08240b3..e2e7d2f39d3 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/25_script_upsert.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/25_script_upsert.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/30_internal_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/30_internal_version.yaml.cs
index f8542c2b892..6541d048c9a 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/30_internal_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/30_internal_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/35_external_version.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/35_external_version.yaml.cs
index 0e8720465f7..493b9fd422a 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/35_external_version.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/35_external_version.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/35_other_versions.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/35_other_versions.yaml.cs
index ff6dfd458eb..c1bfc26eeac 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/35_other_versions.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/35_other_versions.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/40_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/40_routing.yaml.cs
index f48a4c83b47..b5fde166727 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/40_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/40_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/50_parent.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/50_parent.yaml.cs
index 075cbd52a73..9d56ff1b589 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/50_parent.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/50_parent.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/55_parent_with_routing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/55_parent_with_routing.yaml.cs
index e9a82dba92f..601e1dea0f4 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/55_parent_with_routing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/55_parent_with_routing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/60_refresh.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/60_refresh.yaml.cs
index b0b89072fa3..8d77dcdfdb8 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/60_refresh.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/60_refresh.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/70_timestamp.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/70_timestamp.yaml.cs
index d6493ebf157..5c037b009d4 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/70_timestamp.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/70_timestamp.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/75_ttl.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/75_ttl.yaml.cs
index d220a3c0265..2d85f1bb05e 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/75_ttl.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/75_ttl.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/80_fields.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/80_fields.yaml.cs
index c906c84026b..3620669ab3d 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/80_fields.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/80_fields.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/85_fields_meta.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/85_fields_meta.yaml.cs
index d4f969fda25..3096122eb78 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/85_fields_meta.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/85_fields_meta.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/90_missing.yaml.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/90_missing.yaml.cs
index 287799f1bb9..4fd3daf1251 100644
--- a/src/Tests/Elasticsearch.Net.Integration.Yaml/update/90_missing.yaml.cs
+++ b/src/Tests/Elasticsearch.Net.Integration.Yaml/update/90_missing.yaml.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/BuildInResponseAsyncTests.cs b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/BuildInResponseAsyncTests.cs
index 23dcf9a90b3..078941e9e7b 100644
--- a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/BuildInResponseAsyncTests.cs
+++ b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/BuildInResponseAsyncTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Configuration;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
diff --git a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/BuildInResponseTests.cs b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/BuildInResponseTests.cs
index 7532ae4410f..2e1dc200b4e 100644
--- a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/BuildInResponseTests.cs
+++ b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/BuildInResponseTests.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Configuration;
 using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 using Autofac.Extras.FakeItEasy;
 using Elasticsearch.Net.Connection;
 using Elasticsearch.Net.Tests.Unit.Stubs;
diff --git a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/ConcurrencyTests.cs b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/ConcurrencyTests.cs
index 21a4e4a93f7..e1235393c01 100644
--- a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/ConcurrencyTests.cs
+++ b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/ConcurrencyTests.cs
@@ -2,21 +2,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
-using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
-using Autofac;
-using Autofac.Core.Activators.Reflection;
 using Autofac.Extras.FakeItEasy;
 using Elasticsearch.Net.Connection;
 using Elasticsearch.Net.Connection.Configuration;
 using Elasticsearch.Net.ConnectionPool;
-using Elasticsearch.Net.Exceptions;
-using Elasticsearch.Net.Providers;
 using Elasticsearch.Net.Tests.Unit.Stubs;
-using FakeItEasy;
 using FluentAssertions;
 using NUnit.Framework;
 
diff --git a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/ElasticsearchServerExceptions.cs b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/ElasticsearchServerExceptions.cs
index 5ebe9005580..ec2c779ab78 100644
--- a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/ElasticsearchServerExceptions.cs
+++ b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/ElasticsearchServerExceptions.cs
@@ -1,10 +1,8 @@
 using System;
 using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 using Autofac.Extras.FakeItEasy;
 using Elasticsearch.Net.Connection;
-using Elasticsearch.Net.Exceptions;
 using Elasticsearch.Net.Tests.Unit.Stubs;
 using FakeItEasy;
 using FluentAssertions;
diff --git a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/NoRetryOnServerExceptionTests.cs b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/NoRetryOnServerExceptionTests.cs
index 004e6d824e5..74d6e640a32 100644
--- a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/NoRetryOnServerExceptionTests.cs
+++ b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/NoRetryOnServerExceptionTests.cs
@@ -1,12 +1,9 @@
 using System;
 using System.IO;
-using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
 using Autofac.Extras.FakeItEasy;
 using Elasticsearch.Net.Connection;
 using Elasticsearch.Net.ConnectionPool;
-using Elasticsearch.Net.Exceptions;
 using Elasticsearch.Net.Tests.Unit.Stubs;
 using FakeItEasy;
 using FluentAssertions;
diff --git a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/SkipDeadNodesTests.cs b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/SkipDeadNodesTests.cs
index 2cbe46f0bd6..d71268517fa 100644
--- a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/SkipDeadNodesTests.cs
+++ b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/SkipDeadNodesTests.cs
@@ -1,18 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using Autofac;
-using Autofac.Core.Activators.Reflection;
 using Autofac.Extras.FakeItEasy;
 using Elasticsearch.Net.Connection;
 using Elasticsearch.Net.Connection.Configuration;
 using Elasticsearch.Net.ConnectionPool;
-using Elasticsearch.Net.Exceptions;
 using Elasticsearch.Net.Providers;
 using Elasticsearch.Net.Tests.Unit.Stubs;
 using FakeItEasy;
diff --git a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/SniffingConnectionPoolTests.cs b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/SniffingConnectionPoolTests.cs
index fcdcab3d4ee..53815d64ad4 100644
--- a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/SniffingConnectionPoolTests.cs
+++ b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/SniffingConnectionPoolTests.cs
@@ -1,21 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Autofac;
 using Autofac.Extras.FakeItEasy;
 using Elasticsearch.Net.Connection;
 using Elasticsearch.Net.Connection.Configuration;
 using Elasticsearch.Net.ConnectionPool;
 using Elasticsearch.Net.Exceptions;
 using Elasticsearch.Net.Providers;
-using Elasticsearch.Net.Serialization;
 using Elasticsearch.Net.Tests.Unit.Stubs;
 using FakeItEasy;
-using FakeItEasy.Configuration;
-using FakeItEasy.Core;
 using FluentAssertions;
 using NUnit.Framework;
 
diff --git a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/StaticConnectionPoolRetryTests.cs b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/StaticConnectionPoolRetryTests.cs
index c328a127cc8..6468e48ee8d 100644
--- a/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/StaticConnectionPoolRetryTests.cs
+++ b/src/Tests/Elasticsearch.Net.Tests.Unit/Connection/StaticConnectionPoolRetryTests.cs
@@ -2,11 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
-using System.Runtime.InteropServices;
-using System.Text;
 using Autofac;
-using Autofac.Core.Activators.Reflection;
 using Autofac.Extras.FakeItEasy;
 using Elasticsearch.Net.Connection;
 using Elasticsearch.Net.Connection.Configuration;
diff --git a/src/Tests/Elasticsearch.Net.Tests.Unit/Stubs/FakeCalls.cs b/src/Tests/Elasticsearch.Net.Tests.Unit/Stubs/FakeCalls.cs
index 22f450cc263..71a60c6df92 100644
--- a/src/Tests/Elasticsearch.Net.Tests.Unit/Stubs/FakeCalls.cs
+++ b/src/Tests/Elasticsearch.Net.Tests.Unit/Stubs/FakeCalls.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/src/Tests/Elasticsearch.Net.Tests.Unit/Stubs/NoopConnection.cs b/src/Tests/Elasticsearch.Net.Tests.Unit/Stubs/NoopConnection.cs
index 5160f14e936..80080d65a8d 100644
--- a/src/Tests/Elasticsearch.Net.Tests.Unit/Stubs/NoopConnection.cs
+++ b/src/Tests/Elasticsearch.Net.Tests.Unit/Stubs/NoopConnection.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Elasticsearch.Net.Connection;
 using Elasticsearch.Net.Connection.Configuration;
diff --git a/src/Tests/Nest.Tests.Integration/Aggregations/MetricAggregationTests.cs b/src/Tests/Nest.Tests.Integration/Aggregations/MetricAggregationTests.cs
index a671367f09f..c1d5c40acc1 100644
--- a/src/Tests/Nest.Tests.Integration/Aggregations/MetricAggregationTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Aggregations/MetricAggregationTests.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using Elasticsearch.Net;
 using FluentAssertions;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Integration/Aggregations/NestedBucketAggregationTests.cs b/src/Tests/Nest.Tests.Integration/Aggregations/NestedBucketAggregationTests.cs
index b6f693fc72a..d128e018675 100644
--- a/src/Tests/Nest.Tests.Integration/Aggregations/NestedBucketAggregationTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Aggregations/NestedBucketAggregationTests.cs
@@ -1,6 +1,4 @@
 using System.Linq;
-using System.Security.AccessControl;
-using Elasticsearch.Net;
 using FluentAssertions;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Integration/Aggregations/SingleBucketAggregationTests.cs b/src/Tests/Nest.Tests.Integration/Aggregations/SingleBucketAggregationTests.cs
index 68ed704aa68..295b8f94c63 100644
--- a/src/Tests/Nest.Tests.Integration/Aggregations/SingleBucketAggregationTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Aggregations/SingleBucketAggregationTests.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using Elasticsearch.Net;
 using FluentAssertions;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Integration/Aggregations/StatsAggregationTests.cs b/src/Tests/Nest.Tests.Integration/Aggregations/StatsAggregationTests.cs
index 59947f7bd5c..276e9e56890 100644
--- a/src/Tests/Nest.Tests.Integration/Aggregations/StatsAggregationTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Aggregations/StatsAggregationTests.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using Elasticsearch.Net;
 using FluentAssertions;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Integration/Attributes/SkipVersionAttribute.cs b/src/Tests/Nest.Tests.Integration/Attributes/SkipVersionAttribute.cs
index 6a0e84c281b..b3784979aae 100644
--- a/src/Tests/Nest.Tests.Integration/Attributes/SkipVersionAttribute.cs
+++ b/src/Tests/Nest.Tests.Integration/Attributes/SkipVersionAttribute.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 namespace Nest.Tests.Integration
diff --git a/src/Tests/Nest.Tests.Integration/Cluster/GetSettingsTests.cs b/src/Tests/Nest.Tests.Integration/Cluster/GetSettingsTests.cs
index 28ac10828e0..4308c244bca 100644
--- a/src/Tests/Nest.Tests.Integration/Cluster/GetSettingsTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Cluster/GetSettingsTests.cs
@@ -1,5 +1,4 @@
-using Elasticsearch.Net;
-using NUnit.Framework;
+using NUnit.Framework;
 
 namespace Nest.Tests.Integration.Cluster
 {
diff --git a/src/Tests/Nest.Tests.Integration/Cluster/NodeTests.cs b/src/Tests/Nest.Tests.Integration/Cluster/NodeTests.cs
index 1965b134df0..8992a35b782 100644
--- a/src/Tests/Nest.Tests.Integration/Cluster/NodeTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Cluster/NodeTests.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using System.Runtime.Remoting.Channels;
 using Elasticsearch.Net;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Integration/Cluster/PutSettingsTests.cs b/src/Tests/Nest.Tests.Integration/Cluster/PutSettingsTests.cs
index 7218bf48b39..3b7208d67d3 100644
--- a/src/Tests/Nest.Tests.Integration/Cluster/PutSettingsTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Cluster/PutSettingsTests.cs
@@ -1,5 +1,4 @@
-using Elasticsearch.Net;
-using NUnit.Framework;
+using NUnit.Framework;
 
 namespace Nest.Tests.Integration.Cluster
 {
diff --git a/src/Tests/Nest.Tests.Integration/Connection/Failover/SniffTests.cs b/src/Tests/Nest.Tests.Integration/Connection/Failover/SniffTests.cs
index b074bd5fd92..ccbd2a180ad 100644
--- a/src/Tests/Nest.Tests.Integration/Connection/Failover/SniffTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Connection/Failover/SniffTests.cs
@@ -2,13 +2,8 @@
 using System.Diagnostics;
 using System.Linq;
 using Elasticsearch.Net;
-using Elasticsearch.Net.Connection;
 using Elasticsearch.Net.ConnectionPool;
-using FluentAssertions;
 using NUnit.Framework;
-using Nest.Tests.MockData.Domain;
-using Nest.Resolvers;
-using System.Net;
 
 namespace Nest.Tests.Integration.Core.Bulk
 {
diff --git a/src/Tests/Nest.Tests.Integration/Connection/Thrift/ThiftBugReportTests.cs b/src/Tests/Nest.Tests.Integration/Connection/Thrift/ThiftBugReportTests.cs
index 18ddb31e7c0..8de60ec08a4 100644
--- a/src/Tests/Nest.Tests.Integration/Connection/Thrift/ThiftBugReportTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Connection/Thrift/ThiftBugReportTests.cs
@@ -3,11 +3,8 @@
 using Elasticsearch.Net.Connection.Thrift;
 using Elasticsearch.Net.ConnectionPool;
 using FluentAssertions;
-using NUnit.Framework;
-using Nest.Tests.MockData.Domain;
-using Nest.Resolvers;
-using System.Net;
-
+using NUnit.Framework;
+
 namespace Nest.Tests.Integration.Core.Bulk
 {
 	[TestFixture]
diff --git a/src/Tests/Nest.Tests.Integration/ConnectionTests.cs b/src/Tests/Nest.Tests.Integration/ConnectionTests.cs
index 1f8f4e421b6..2072a184fb6 100644
--- a/src/Tests/Nest.Tests.Integration/ConnectionTests.cs
+++ b/src/Tests/Nest.Tests.Integration/ConnectionTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
-using Elasticsearch.Net.Exceptions;
 using NUnit.Framework;
-using Nest;
 
 namespace Nest.Tests.Integration
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/AsyncTests.cs b/src/Tests/Nest.Tests.Integration/Core/AsyncTests.cs
index d5b88da33c2..bfe1553cdf6 100644
--- a/src/Tests/Nest.Tests.Integration/Core/AsyncTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/AsyncTests.cs
@@ -1,7 +1,5 @@
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
-using System.Diagnostics;
-using System.Net;
 
 namespace Nest.Tests.Integration.Core
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkTests.cs b/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkTests.cs
index b35ffe7d066..167ec3e7f25 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkTests.cs
@@ -3,7 +3,6 @@
 using FluentAssertions;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using Nest.Resolvers;
 
 namespace Nest.Tests.Integration.Core.Bulk
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/ClearScroll/ClearScrollTests.cs b/src/Tests/Nest.Tests.Integration/Core/ClearScroll/ClearScrollTests.cs
index a8856c0519d..1e3874fe7ce 100644
--- a/src/Tests/Nest.Tests.Integration/Core/ClearScroll/ClearScrollTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/ClearScroll/ClearScrollTests.cs
@@ -2,7 +2,6 @@
 using FluentAssertions;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using Nest.Resolvers;
 using Elasticsearch.Net;
 
 namespace Nest.Tests.Integration.Core.ClearScroll
diff --git a/src/Tests/Nest.Tests.Integration/Core/Exists/DocumentExistsTests.cs b/src/Tests/Nest.Tests.Integration/Core/Exists/DocumentExistsTests.cs
index e4fe398d03d..30800ed71d6 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Exists/DocumentExistsTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Exists/DocumentExistsTests.cs
@@ -2,8 +2,6 @@
 using FluentAssertions;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest.Tests.Integration.Core.Exists
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Get/GetFullTests.cs b/src/Tests/Nest.Tests.Integration/Core/Get/GetFullTests.cs
index 63ba4f4620f..d6812e914e2 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Get/GetFullTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Get/GetFullTests.cs
@@ -1,14 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using NUnit.Framework;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using Nest;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
 using Nest.Tests.MockData.Domain;
 using FluentAssertions;
 namespace Nest.Tests.Integration.Core.Get
diff --git a/src/Tests/Nest.Tests.Integration/Core/Get/GetMultiTests.cs b/src/Tests/Nest.Tests.Integration/Core/Get/GetMultiTests.cs
index 88b05534ae8..1ca5b88d0f8 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Get/GetMultiTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Get/GetMultiTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Nest.Tests.MockData;
 using NUnit.Framework;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using FluentAssertions;
 
diff --git a/src/Tests/Nest.Tests.Integration/Core/Get/GetTests.cs b/src/Tests/Nest.Tests.Integration/Core/Get/GetTests.cs
index a4daec024be..8a18e0dc283 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Get/GetTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Get/GetTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Integration/Core/IndexTests.cs b/src/Tests/Nest.Tests.Integration/Core/IndexTests.cs
index c87e9d9b8c6..91a00020c18 100644
--- a/src/Tests/Nest.Tests.Integration/Core/IndexTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/IndexTests.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Integration/Core/Map/AnalyzerField/AnalyzerFieldTests.cs b/src/Tests/Nest.Tests.Integration/Core/Map/AnalyzerField/AnalyzerFieldTests.cs
index 0d88f689803..201a80bc21a 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Map/AnalyzerField/AnalyzerFieldTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Map/AnalyzerField/AnalyzerFieldTests.cs
@@ -1,6 +1,5 @@
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using System.Reflection;
 
 namespace Nest.Tests.Integration.Core.Map.AnalyzerField
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Map/BoostField/BoostFieldTests.cs b/src/Tests/Nest.Tests.Integration/Core/Map/BoostField/BoostFieldTests.cs
index f24152282e5..a196fe479ef 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Map/BoostField/BoostFieldTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Map/BoostField/BoostFieldTests.cs
@@ -1,6 +1,5 @@
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using System.Reflection;
 
 namespace Nest.Tests.Integration.Core.Map.BoostField
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Map/DynamicTemplates/DynamicTemplatesTests.cs b/src/Tests/Nest.Tests.Integration/Core/Map/DynamicTemplates/DynamicTemplatesTests.cs
index 841352b958b..1c819d6b00b 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Map/DynamicTemplates/DynamicTemplatesTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Map/DynamicTemplates/DynamicTemplatesTests.cs
@@ -1,6 +1,5 @@
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using System.Reflection;
 
 namespace Nest.Tests.Integration.Core.Map.DynamicTemplates
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Map/IdField/IdFieldTests.cs b/src/Tests/Nest.Tests.Integration/Core/Map/IdField/IdFieldTests.cs
index 1e3c1bfab3e..7d248f4f24a 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Map/IdField/IdFieldTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Map/IdField/IdFieldTests.cs
@@ -1,6 +1,5 @@
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using System.Reflection;
 
 namespace Nest.Tests.Integration.Core.Map.IdField
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Map/MetaField/MetaFieldTests.cs b/src/Tests/Nest.Tests.Integration/Core/Map/MetaField/MetaFieldTests.cs
index c148f8b07e3..e83add81721 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Map/MetaField/MetaFieldTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Map/MetaField/MetaFieldTests.cs
@@ -1,7 +1,6 @@
 using Elasticsearch.Net;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using System.Reflection;
 
 namespace Nest.Tests.Integration.Core.Map.MetaField
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Map/Properties/PropertiesTests.cs b/src/Tests/Nest.Tests.Integration/Core/Map/Properties/PropertiesTests.cs
index b994fd3cac7..7c12646042e 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Map/Properties/PropertiesTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Map/Properties/PropertiesTests.cs
@@ -3,8 +3,6 @@
 using FluentAssertions;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using System.Reflection;
-using Newtonsoft.Json;
 
 namespace Nest.Tests.Integration.Core.Map.Properties
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Map/RootProperties/MapRootObjectPropertiesTests.cs b/src/Tests/Nest.Tests.Integration/Core/Map/RootProperties/MapRootObjectPropertiesTests.cs
index a59ec7187cf..6d11a08650b 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Map/RootProperties/MapRootObjectPropertiesTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Map/RootProperties/MapRootObjectPropertiesTests.cs
@@ -1,6 +1,5 @@
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using System.Reflection;
 
 namespace Nest.Tests.Integration.Core.Map.RootProperties
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Map/RoutingField/RoutingFieldTests.cs b/src/Tests/Nest.Tests.Integration/Core/Map/RoutingField/RoutingFieldTests.cs
index c993732ac97..184b2b0476a 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Map/RoutingField/RoutingFieldTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Map/RoutingField/RoutingFieldTests.cs
@@ -1,6 +1,5 @@
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using System.Reflection;
 
 namespace Nest.Tests.Integration.Core.Map.RoutingField
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Map/SourceField/SourceFieldTests.cs b/src/Tests/Nest.Tests.Integration/Core/Map/SourceField/SourceFieldTests.cs
index 91e640f50e0..8f4e0cdd381 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Map/SourceField/SourceFieldTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Map/SourceField/SourceFieldTests.cs
@@ -1,6 +1,5 @@
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using System.Reflection;
 
 namespace Nest.Tests.Integration.Core.Map.SourceField
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Map/TimestampField/TimestampFieldTests.cs b/src/Tests/Nest.Tests.Integration/Core/Map/TimestampField/TimestampFieldTests.cs
index dc4f6becba4..e3d3c819f13 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Map/TimestampField/TimestampFieldTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Map/TimestampField/TimestampFieldTests.cs
@@ -1,7 +1,5 @@
-using FluentAssertions;
-using NUnit.Framework;
+using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using System.Reflection;
 
 namespace Nest.Tests.Integration.Core.Map.TimestampField
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Map/TtlField/TtlFieldTests.cs b/src/Tests/Nest.Tests.Integration/Core/Map/TtlField/TtlFieldTests.cs
index a103a997d5c..6201a00c972 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Map/TtlField/TtlFieldTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Map/TtlField/TtlFieldTests.cs
@@ -1,6 +1,5 @@
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using System.Reflection;
 
 namespace Nest.Tests.Integration.Core.Map.TtlField
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Map/TypeField/TypeFieldTests.cs b/src/Tests/Nest.Tests.Integration/Core/Map/TypeField/TypeFieldTests.cs
index 6e5f3814eb9..e97d764f2f9 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Map/TypeField/TypeFieldTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Map/TypeField/TypeFieldTests.cs
@@ -1,6 +1,5 @@
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using System.Reflection;
 
 namespace Nest.Tests.Integration.Core.Map.TypeField
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/MoreLikeThis/MltSearchBodyTests.cs b/src/Tests/Nest.Tests.Integration/Core/MoreLikeThis/MltSearchBodyTests.cs
index dd10dc9b819..d90cf020ff1 100644
--- a/src/Tests/Nest.Tests.Integration/Core/MoreLikeThis/MltSearchBodyTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/MoreLikeThis/MltSearchBodyTests.cs
@@ -1,7 +1,6 @@
 using FluentAssertions;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using System.Reflection;
 
 namespace Nest.Tests.Integration.Core.MoreLikeThis
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/MultiSearch/MultiSearchTests.cs b/src/Tests/Nest.Tests.Integration/Core/MultiSearch/MultiSearchTests.cs
index efbdb696074..f1d7bf75842 100644
--- a/src/Tests/Nest.Tests.Integration/Core/MultiSearch/MultiSearchTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/MultiSearch/MultiSearchTests.cs
@@ -2,7 +2,6 @@
 using FluentAssertions;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using Nest.Resolvers;
 using Elasticsearch.Net;
 
 namespace Nest.Tests.Integration.Core.MultiSearch
diff --git a/src/Tests/Nest.Tests.Integration/Core/Repository/CreateRepositoryTests.cs b/src/Tests/Nest.Tests.Integration/Core/Repository/CreateRepositoryTests.cs
index ff8dc478d88..7bbb54fdd38 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Repository/CreateRepositoryTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Repository/CreateRepositoryTests.cs
@@ -2,9 +2,6 @@
 using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
-using Nest.Tests.MockData.Domain;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest.Tests.Integration.Core.Repository
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Repository/RestoreTests.cs b/src/Tests/Nest.Tests.Integration/Core/Repository/RestoreTests.cs
index b6354738a97..a1721ab2d04 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Repository/RestoreTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Repository/RestoreTests.cs
@@ -3,8 +3,6 @@
 using FluentAssertions;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using Nest.Resolvers;
-using Elasticsearch.Net;
 
 namespace Nest.Tests.Integration.Core.Repository
 {
diff --git a/src/Tests/Nest.Tests.Integration/Core/Suggest/SuggestTests.cs b/src/Tests/Nest.Tests.Integration/Core/Suggest/SuggestTests.cs
index e283e407b12..415d75f89f6 100644
--- a/src/Tests/Nest.Tests.Integration/Core/Suggest/SuggestTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/Suggest/SuggestTests.cs
@@ -2,7 +2,6 @@
 using FluentAssertions;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using Nest.Resolvers;
 using Elasticsearch.Net;
 
 namespace Nest.Tests.Integration.Core.Suggest
diff --git a/src/Tests/Nest.Tests.Integration/Core/TermVectors/MultiTermVectorsTests.cs b/src/Tests/Nest.Tests.Integration/Core/TermVectors/MultiTermVectorsTests.cs
index aa01a09fabf..5bbb095616f 100644
--- a/src/Tests/Nest.Tests.Integration/Core/TermVectors/MultiTermVectorsTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/TermVectors/MultiTermVectorsTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using FluentAssertions;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
diff --git a/src/Tests/Nest.Tests.Integration/Core/TermVectors/TermVectorTests.cs b/src/Tests/Nest.Tests.Integration/Core/TermVectors/TermVectorTests.cs
index 399edeee46b..8b4ebc7d544 100644
--- a/src/Tests/Nest.Tests.Integration/Core/TermVectors/TermVectorTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/TermVectors/TermVectorTests.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using FluentAssertions;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
diff --git a/src/Tests/Nest.Tests.Integration/Core/UpdateTests.cs b/src/Tests/Nest.Tests.Integration/Core/UpdateTests.cs
index 91486064cea..ac0159f98c9 100644
--- a/src/Tests/Nest.Tests.Integration/Core/UpdateTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Core/UpdateTests.cs
@@ -1,6 +1,4 @@
-using System.Globalization;
-using System.Linq;
-using Elasticsearch.Net;
+using System.Linq;
 using Nest.Tests.MockData;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
diff --git a/src/Tests/Nest.Tests.Integration/DebugTests/MemoryUsageTests.cs b/src/Tests/Nest.Tests.Integration/DebugTests/MemoryUsageTests.cs
index 3152924be64..46af6c11322 100644
--- a/src/Tests/Nest.Tests.Integration/DebugTests/MemoryUsageTests.cs
+++ b/src/Tests/Nest.Tests.Integration/DebugTests/MemoryUsageTests.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Integration/Index/GetIdFromElasticsearchTests.cs b/src/Tests/Nest.Tests.Integration/Index/GetIdFromElasticsearchTests.cs
index 319ba50b854..acb8d21de00 100644
--- a/src/Tests/Nest.Tests.Integration/Index/GetIdFromElasticsearchTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Index/GetIdFromElasticsearchTests.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Nest.Tests.MockData;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 using Elasticsearch.Net;
 
diff --git a/src/Tests/Nest.Tests.Integration/Index/IndexDefaultValueTests.cs b/src/Tests/Nest.Tests.Integration/Index/IndexDefaultValueTests.cs
index 6bea274aac0..5becfd0ea79 100644
--- a/src/Tests/Nest.Tests.Integration/Index/IndexDefaultValueTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Index/IndexDefaultValueTests.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Elasticsearch.Net;
-using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Integration/Index/IndexUsingUrlIdTests.cs b/src/Tests/Nest.Tests.Integration/Index/IndexUsingUrlIdTests.cs
index 73024b1c9a4..198abd76e44 100644
--- a/src/Tests/Nest.Tests.Integration/Index/IndexUsingUrlIdTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Index/IndexUsingUrlIdTests.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
-using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Integration/Index/ReindexTests.cs b/src/Tests/Nest.Tests.Integration/Index/ReindexTests.cs
index dc4819d1e6e..69ffcda9506 100644
--- a/src/Tests/Nest.Tests.Integration/Index/ReindexTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Index/ReindexTests.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Nest.Tests.MockData;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
 
diff --git a/src/Tests/Nest.Tests.Integration/Indices/AliasTests.cs b/src/Tests/Nest.Tests.Integration/Indices/AliasTests.cs
index e082b8dbe5e..0bf9c9f4663 100644
--- a/src/Tests/Nest.Tests.Integration/Indices/AliasTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Indices/AliasTests.cs
@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using FluentAssertions;
-using Nest.Tests.MockData.DataSources;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Integration/Indices/IndicesTests.cs b/src/Tests/Nest.Tests.Integration/Indices/IndicesTests.cs
index 2f8fb051ed9..82282c26382 100644
--- a/src/Tests/Nest.Tests.Integration/Indices/IndicesTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Indices/IndicesTests.cs
@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
-using Nest.Resolvers;
-using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Integration/Indices/OpenCloseTests.cs b/src/Tests/Nest.Tests.Integration/Indices/OpenCloseTests.cs
index d52f5547392..57a28f4637a 100644
--- a/src/Tests/Nest.Tests.Integration/Indices/OpenCloseTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Indices/OpenCloseTests.cs
@@ -1,5 +1,4 @@
-using Elasticsearch.Net;
-using FluentAssertions;
+using FluentAssertions;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Integration/Indices/StatusTests.cs b/src/Tests/Nest.Tests.Integration/Indices/StatusTests.cs
index 340bf6db5b4..6c6741ee191 100644
--- a/src/Tests/Nest.Tests.Integration/Indices/StatusTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Indices/StatusTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
 
diff --git a/src/Tests/Nest.Tests.Integration/IntegrationSetup.cs b/src/Tests/Nest.Tests.Integration/IntegrationSetup.cs
index bff05232135..288b1be67aa 100644
--- a/src/Tests/Nest.Tests.Integration/IntegrationSetup.cs
+++ b/src/Tests/Nest.Tests.Integration/IntegrationSetup.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest;
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Integration/IntegrationTests.cs b/src/Tests/Nest.Tests.Integration/IntegrationTests.cs
index 9842a99f00a..d731dabe6b2 100644
--- a/src/Tests/Nest.Tests.Integration/IntegrationTests.cs
+++ b/src/Tests/Nest.Tests.Integration/IntegrationTests.cs
@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
-using Nest;
-using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
-using Nest.Resolvers;
 
 namespace Nest.Tests.Integration
 {
diff --git a/src/Tests/Nest.Tests.Integration/RawCalls/DynamicNullTests.cs b/src/Tests/Nest.Tests.Integration/RawCalls/DynamicNullTests.cs
index 637e54ec352..8d9e23bc52c 100644
--- a/src/Tests/Nest.Tests.Integration/RawCalls/DynamicNullTests.cs
+++ b/src/Tests/Nest.Tests.Integration/RawCalls/DynamicNullTests.cs
@@ -3,7 +3,6 @@
 using Elasticsearch.Net.Connection;
 using FluentAssertions;
 using NUnit.Framework;
-using Nest.Tests.MockData.Domain;
 using Elasticsearch.Net;
 
 namespace Nest.Tests.Integration.RawCalls
diff --git a/src/Tests/Nest.Tests.Integration/RawCalls/ReturnTypesTest.cs b/src/Tests/Nest.Tests.Integration/RawCalls/ReturnTypesTest.cs
index d135001dfec..f3e4cff7fe9 100644
--- a/src/Tests/Nest.Tests.Integration/RawCalls/ReturnTypesTest.cs
+++ b/src/Tests/Nest.Tests.Integration/RawCalls/ReturnTypesTest.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
-using Nest.Tests.MockData.Domain;
 using Elasticsearch.Net;
 
 namespace Nest.Tests.Integration.RawCalls
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce211Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce211Tests.cs
index d6dffd0d94b..fd396e89464 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce211Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce211Tests.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Nest.Tests.MockData;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 using System.Diagnostics;
 using FluentAssertions;
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce308Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce308Tests.cs
index 6866e33c94e..c4ba2881ccb 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce308Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce308Tests.cs
@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Nest.Tests.MockData;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
-using System.Diagnostics;
 using FluentAssertions;
 
 namespace Nest.Tests.Integration.Reproduce
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce319Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce319Tests.cs
index c3984e3166c..98a57d9d2a5 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce319Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce319Tests.cs
@@ -1,12 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Nest.Resolvers;
-using Nest.Tests.MockData;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
-using System.Diagnostics;
-using FluentAssertions;
 
 namespace Nest.Tests.Integration.Reproduce
 {
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce325Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce325Tests.cs
index 2945cc44779..7cdfadf6995 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce325Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce325Tests.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Nest.Tests.MockData;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
-using System.Diagnostics;
-using FluentAssertions;
 
 namespace Nest.Tests.Integration.Reproduce
 {
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce346Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce346Tests.cs
index 15439fa48b2..3e063950d47 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce346Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce346Tests.cs
@@ -4,11 +4,8 @@
 using System.Text.RegularExpressions;
 using Elasticsearch.Net;
 using Elasticsearch.Net.Connection;
-using Nest.Tests.MockData;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 using System.Diagnostics;
-using FluentAssertions;
 
 namespace Nest.Tests.Integration.Reproduce
 {
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce389Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce389Tests.cs
index 047040b6a1a..f50081e4c34 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce389Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce389Tests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
-using System.Diagnostics;
-using FluentAssertions;
 
 namespace Nest.Tests.Integration.Reproduce
 {
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce437Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce437Tests.cs
index 9192d4a0d68..e4d75afd385 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce437Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce437Tests.cs
@@ -1,12 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Remoting.Channels;
-using Nest.Tests.MockData;
-using Nest.Tests.MockData.Domain;
-using Newtonsoft.Json;
 using NUnit.Framework;
-using System.Diagnostics;
 using FluentAssertions;
 
 namespace Nest.Tests.Integration.Reproduce
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce450Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce450Tests.cs
index a158d3d3e0b..c12b9472ee6 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce450Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce450Tests.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Remoting.Channels;
-using Nest.Tests.MockData;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
-using System.Diagnostics;
 using FluentAssertions;
 using Elasticsearch.Net;
 
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce487Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce487Tests.cs
index 914ddc3de9e..2a9c13bd568 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce487Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce487Tests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
-using System.Diagnostics;
 using FluentAssertions;
 
 namespace Nest.Tests.Integration.Reproduce
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce628Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce628Tests.cs
index e77c8813d18..d0fdddf3744 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce628Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce628Tests.cs
@@ -2,10 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Elasticsearch.Net;
-using Nest.Tests.MockData;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
-using System.Diagnostics;
 using FluentAssertions;
 
 namespace Nest.Tests.Integration.Reproduce
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce643Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce643Tests.cs
index dadd97d25b3..927c1846b5a 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce643Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce643Tests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Elasticsearch.Net;
-using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
-using System.Diagnostics;
 using FluentAssertions;
 
 namespace Nest.Tests.Integration.Reproduce
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce654Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce654Tests.cs
index 30de5dac4d2..6f80e5c0ed3 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce654Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce654Tests.cs
@@ -2,12 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Elasticsearch.Net;
-using Elasticsearch.Net.Connection;
-using Elasticsearch.Net.Exceptions;
-using Nest.Tests.MockData;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
-using System.Diagnostics;
 using FluentAssertions;
 
 namespace Nest.Tests.Integration.Reproduce
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce659Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce659Tests.cs
index da4346e8510..5c6d13b5eb3 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce659Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce659Tests.cs
@@ -2,12 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Elasticsearch.Net;
-using Elasticsearch.Net.Connection;
-using Elasticsearch.Net.Exceptions;
-using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
-using System.Diagnostics;
 using FluentAssertions;
 
 namespace Nest.Tests.Integration.Reproduce
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce723Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce723Tests.cs
index 3e2ad5cf9c3..491e258f2bc 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce723Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce723Tests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Elasticsearch.Net;
-using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
-using System.Diagnostics;
 using FluentAssertions;
 
 namespace Nest.Tests.Integration.Reproduce
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce730Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce730Tests.cs
index dfd0f877e93..e1227e29461 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce730Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce730Tests.cs
@@ -4,8 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest.Tests.Integration.Reproduce
 {
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce732Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce732Tests.cs
index ff34b2f2be5..92346f00248 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce732Tests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce732Tests.cs
@@ -4,8 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest.Tests.Integration.Reproduce
 {
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/ReproduceConnectionStallsTests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/ReproduceConnectionStallsTests.cs
index fb75e557d7c..d375ee3936c 100644
--- a/src/Tests/Nest.Tests.Integration/Reproduce/ReproduceConnectionStallsTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Reproduce/ReproduceConnectionStallsTests.cs
@@ -2,13 +2,9 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Net.Sockets;
-using System.Runtime.Remoting.Channels;
-using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
-using Newtonsoft.Json;
 using NUnit.Framework;
 using System.Diagnostics;
 using FluentAssertions;
diff --git a/src/Tests/Nest.Tests.Integration/Search/CountTests.cs b/src/Tests/Nest.Tests.Integration/Search/CountTests.cs
index 23546d005ec..2acbb439424 100644
--- a/src/Tests/Nest.Tests.Integration/Search/CountTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Search/CountTests.cs
@@ -3,7 +3,6 @@
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 using FluentAssertions;
-using Nest.Resolvers;
 
 namespace Nest.Tests.Integration.Search
 {
diff --git a/src/Tests/Nest.Tests.Integration/Search/FieldTests/FieldsTest.cs b/src/Tests/Nest.Tests.Integration/Search/FieldTests/FieldsTest.cs
index 17bf4266057..db1fcb71d69 100644
--- a/src/Tests/Nest.Tests.Integration/Search/FieldTests/FieldsTest.cs
+++ b/src/Tests/Nest.Tests.Integration/Search/FieldTests/FieldsTest.cs
@@ -1,5 +1,4 @@
-using System.Data.Common;
-using FluentAssertions;
+using FluentAssertions;
 
 namespace Nest.Tests.Integration.Search.FieldTests
 {
diff --git a/src/Tests/Nest.Tests.Integration/Search/Filter/MissingExistsFilterTests.cs b/src/Tests/Nest.Tests.Integration/Search/Filter/MissingExistsFilterTests.cs
index 32b247bf9a6..4ab70802aba 100644
--- a/src/Tests/Nest.Tests.Integration/Search/Filter/MissingExistsFilterTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Search/Filter/MissingExistsFilterTests.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Linq.Expressions;
 using Elasticsearch.Net;
-using FluentAssertions;
 using NUnit.Framework;
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
diff --git a/src/Tests/Nest.Tests.Integration/Search/Filter/RangeFilterTests.cs b/src/Tests/Nest.Tests.Integration/Search/Filter/RangeFilterTests.cs
index 31955e28e41..eb3e07466ff 100644
--- a/src/Tests/Nest.Tests.Integration/Search/Filter/RangeFilterTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Search/Filter/RangeFilterTests.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using Elasticsearch.Net;
-using FluentAssertions;
 using NUnit.Framework;
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
diff --git a/src/Tests/Nest.Tests.Integration/Search/Filter/ScriptFilterTests.cs b/src/Tests/Nest.Tests.Integration/Search/Filter/ScriptFilterTests.cs
index 706e8e65b29..eb53dc25a1c 100644
--- a/src/Tests/Nest.Tests.Integration/Search/Filter/ScriptFilterTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Search/Filter/ScriptFilterTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Linq.Expressions;
 using NUnit.Framework;
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
diff --git a/src/Tests/Nest.Tests.Integration/Search/Query/BoolQueryResults.cs b/src/Tests/Nest.Tests.Integration/Search/Query/BoolQueryResults.cs
index 460fb887984..2db77800d9a 100644
--- a/src/Tests/Nest.Tests.Integration/Search/Query/BoolQueryResults.cs
+++ b/src/Tests/Nest.Tests.Integration/Search/Query/BoolQueryResults.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Reflection;
 using Elasticsearch.Net;
-using FluentAssertions;
 using NUnit.Framework;
-using Nest.Tests.Integration;
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 
diff --git a/src/Tests/Nest.Tests.Integration/Search/Query/TermQueryDynamic.cs b/src/Tests/Nest.Tests.Integration/Search/Query/TermQueryDynamic.cs
index b586335de9c..74a51b5de63 100644
--- a/src/Tests/Nest.Tests.Integration/Search/Query/TermQueryDynamic.cs
+++ b/src/Tests/Nest.Tests.Integration/Search/Query/TermQueryDynamic.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using NUnit.Framework;
-using Nest.Tests.MockData.Domain;
 
 namespace Nest.Tests.Integration.Search.Query
 {
diff --git a/src/Tests/Nest.Tests.Integration/Search/Query/TermToString.cs b/src/Tests/Nest.Tests.Integration/Search/Query/TermToString.cs
index 21a0943c1d5..5f3dee0fc68 100644
--- a/src/Tests/Nest.Tests.Integration/Search/Query/TermToString.cs
+++ b/src/Tests/Nest.Tests.Integration/Search/Query/TermToString.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Reflection;
 using Elasticsearch.Net;
-using FluentAssertions;
 using NUnit.Framework;
-using Nest.Tests.Integration;
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 
diff --git a/src/Tests/Nest.Tests.Integration/Search/QueryDSLTests.cs b/src/Tests/Nest.Tests.Integration/Search/QueryDSLTests.cs
index 8e393cf7e80..d9c97e48862 100644
--- a/src/Tests/Nest.Tests.Integration/Search/QueryDSLTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Search/QueryDSLTests.cs
@@ -1,9 +1,7 @@
-using System.Diagnostics;
-using System.Linq;
+using System.Linq;
 using Elasticsearch.Net;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using Nest.Tests.MockData;
 
 namespace Nest.Tests.Integration.Search
 {
diff --git a/src/Tests/Nest.Tests.Integration/Search/Scroll/ScrollTests.cs b/src/Tests/Nest.Tests.Integration/Search/Scroll/ScrollTests.cs
index 07b0bd84c31..e5f54527a72 100644
--- a/src/Tests/Nest.Tests.Integration/Search/Scroll/ScrollTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Search/Scroll/ScrollTests.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using Elasticsearch.Net;
-using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 using FluentAssertions;
diff --git a/src/Tests/Nest.Tests.Integration/Search/SearchTypeTests/SearchTypeScanTests.cs b/src/Tests/Nest.Tests.Integration/Search/SearchTypeTests/SearchTypeScanTests.cs
index 8834fba976d..6e9ead0ae0f 100644
--- a/src/Tests/Nest.Tests.Integration/Search/SearchTypeTests/SearchTypeScanTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Search/SearchTypeTests/SearchTypeScanTests.cs
@@ -1,7 +1,5 @@
 using System.Linq;
 using Elasticsearch.Net;
-using Elasticsearch.Net.Connection;
-using Elasticsearch.Net.Exceptions;
 using FluentAssertions;
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
diff --git a/src/Tests/Nest.Tests.Integration/Warmers/WarmersTests.cs b/src/Tests/Nest.Tests.Integration/Warmers/WarmersTests.cs
index 9bedf4edbfd..a0c0f10549e 100644
--- a/src/Tests/Nest.Tests.Integration/Warmers/WarmersTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Warmers/WarmersTests.cs
@@ -1,9 +1,6 @@
-using System.Text;
-using FluentAssertions;
-using Nest.Resolvers;
+using FluentAssertions;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
-using System.Net;
 using System.Linq;
 
 namespace Nest.Tests.Integration.Warmers
diff --git a/src/Tests/Nest.Tests.MockData/DataSources/BoolSource.cs b/src/Tests/Nest.Tests.MockData/DataSources/BoolSource.cs
index d5a908000b8..54082c52045 100644
--- a/src/Tests/Nest.Tests.MockData/DataSources/BoolSource.cs
+++ b/src/Tests/Nest.Tests.MockData/DataSources/BoolSource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using AutoPoco.Engine;
 
 namespace Nest.Tests.MockData.DataSources
diff --git a/src/Tests/Nest.Tests.MockData/DataSources/DoubleSource.cs b/src/Tests/Nest.Tests.MockData/DataSources/DoubleSource.cs
index abda8d326fc..6716ce3681e 100644
--- a/src/Tests/Nest.Tests.MockData/DataSources/DoubleSource.cs
+++ b/src/Tests/Nest.Tests.MockData/DataSources/DoubleSource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using AutoPoco.Engine;
 
 namespace Nest.Tests.MockData.DataSources
diff --git a/src/Tests/Nest.Tests.MockData/DataSources/ElasticsearchProjectDescriptionSource.cs b/src/Tests/Nest.Tests.MockData/DataSources/ElasticsearchProjectDescriptionSource.cs
index e12eee2b5be..e76952600f4 100644
--- a/src/Tests/Nest.Tests.MockData/DataSources/ElasticsearchProjectDescriptionSource.cs
+++ b/src/Tests/Nest.Tests.MockData/DataSources/ElasticsearchProjectDescriptionSource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using AutoPoco.Engine;
 
 namespace Nest.Tests.MockData.DataSources
diff --git a/src/Tests/Nest.Tests.MockData/DataSources/ElasticsearchProjectsDataSource.cs b/src/Tests/Nest.Tests.MockData/DataSources/ElasticsearchProjectsDataSource.cs
index 1324294f0f4..9cc484f078c 100644
--- a/src/Tests/Nest.Tests.MockData/DataSources/ElasticsearchProjectsDataSource.cs
+++ b/src/Tests/Nest.Tests.MockData/DataSources/ElasticsearchProjectsDataSource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using AutoPoco.Engine;
 
 namespace Nest.Tests.MockData.DataSources
diff --git a/src/Tests/Nest.Tests.MockData/DataSources/FloatArraySource.cs b/src/Tests/Nest.Tests.MockData/DataSources/FloatArraySource.cs
index 2b67ac02bf1..313485222c3 100644
--- a/src/Tests/Nest.Tests.MockData/DataSources/FloatArraySource.cs
+++ b/src/Tests/Nest.Tests.MockData/DataSources/FloatArraySource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using AutoPoco.Engine;
 
 namespace Nest.Tests.MockData.DataSources
diff --git a/src/Tests/Nest.Tests.MockData/DataSources/FloatSource.cs b/src/Tests/Nest.Tests.MockData/DataSources/FloatSource.cs
index 3fdfb8d1358..797dfe4627b 100644
--- a/src/Tests/Nest.Tests.MockData/DataSources/FloatSource.cs
+++ b/src/Tests/Nest.Tests.MockData/DataSources/FloatSource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using AutoPoco.Engine;
 
 namespace Nest.Tests.MockData.DataSources
diff --git a/src/Tests/Nest.Tests.MockData/DataSources/GeoLocationSource.cs b/src/Tests/Nest.Tests.MockData/DataSources/GeoLocationSource.cs
index 4e4f08e3a7f..e3ed2216822 100644
--- a/src/Tests/Nest.Tests.MockData/DataSources/GeoLocationSource.cs
+++ b/src/Tests/Nest.Tests.MockData/DataSources/GeoLocationSource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using AutoPoco.Engine;
 using Nest.Tests.MockData.Domain;
 
diff --git a/src/Tests/Nest.Tests.MockData/DataSources/IncrementalNameSource.cs b/src/Tests/Nest.Tests.MockData/DataSources/IncrementalNameSource.cs
index bfbf5143926..43dce388414 100644
--- a/src/Tests/Nest.Tests.MockData/DataSources/IncrementalNameSource.cs
+++ b/src/Tests/Nest.Tests.MockData/DataSources/IncrementalNameSource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using AutoPoco.Engine;
 
 namespace Nest.Tests.MockData.DataSources
diff --git a/src/Tests/Nest.Tests.MockData/DataSources/IntListSource.cs b/src/Tests/Nest.Tests.MockData/DataSources/IntListSource.cs
index 0a3fa826543..25ca36b76de 100644
--- a/src/Tests/Nest.Tests.MockData/DataSources/IntListSource.cs
+++ b/src/Tests/Nest.Tests.MockData/DataSources/IntListSource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using AutoPoco.Engine;
 
 namespace Nest.Tests.MockData.DataSources
diff --git a/src/Tests/Nest.Tests.MockData/DataSources/IntSource.cs b/src/Tests/Nest.Tests.MockData/DataSources/IntSource.cs
index 2b516547021..e95cd531ab0 100644
--- a/src/Tests/Nest.Tests.MockData/DataSources/IntSource.cs
+++ b/src/Tests/Nest.Tests.MockData/DataSources/IntSource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using AutoPoco.Engine;
 
 namespace Nest.Tests.MockData.DataSources
diff --git a/src/Tests/Nest.Tests.MockData/DataSources/IpSource.cs b/src/Tests/Nest.Tests.MockData/DataSources/IpSource.cs
index 772466aa029..dee28280c14 100644
--- a/src/Tests/Nest.Tests.MockData/DataSources/IpSource.cs
+++ b/src/Tests/Nest.Tests.MockData/DataSources/IpSource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using AutoPoco.Engine;
 
 namespace Nest.Tests.MockData.DataSources
diff --git a/src/Tests/Nest.Tests.MockData/DataSources/LOCSource.cs b/src/Tests/Nest.Tests.MockData/DataSources/LOCSource.cs
index cbfff44f58d..00e5e0fb565 100644
--- a/src/Tests/Nest.Tests.MockData/DataSources/LOCSource.cs
+++ b/src/Tests/Nest.Tests.MockData/DataSources/LOCSource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using AutoPoco.Engine;
 
 namespace Nest.Tests.MockData.DataSources
diff --git a/src/Tests/Nest.Tests.MockData/DataSources/LongSource.cs b/src/Tests/Nest.Tests.MockData/DataSources/LongSource.cs
index 494952c5e5d..6c64f982374 100644
--- a/src/Tests/Nest.Tests.MockData/DataSources/LongSource.cs
+++ b/src/Tests/Nest.Tests.MockData/DataSources/LongSource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using AutoPoco.Engine;
 
 namespace Nest.Tests.MockData.DataSources
diff --git a/src/Tests/Nest.Tests.MockData/Domain/BoolTerm.cs b/src/Tests/Nest.Tests.MockData/Domain/BoolTerm.cs
index 6162faad61f..9e7a495548f 100644
--- a/src/Tests/Nest.Tests.MockData/Domain/BoolTerm.cs
+++ b/src/Tests/Nest.Tests.MockData/Domain/BoolTerm.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest.Tests.MockData.Domain
 {
diff --git a/src/Tests/Nest.Tests.MockData/Domain/ElasticsearchProject.cs b/src/Tests/Nest.Tests.MockData/Domain/ElasticsearchProject.cs
index fd0e025b14a..943c5cd486d 100644
--- a/src/Tests/Nest.Tests.MockData/Domain/ElasticsearchProject.cs
+++ b/src/Tests/Nest.Tests.MockData/Domain/ElasticsearchProject.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Nest;
 
 namespace Nest.Tests.MockData.Domain
 {
diff --git a/src/Tests/Nest.Tests.MockData/Domain/GeoLocation.cs b/src/Tests/Nest.Tests.MockData/Domain/GeoLocation.cs
index e5cc24ac779..b1ed5b48d59 100644
--- a/src/Tests/Nest.Tests.MockData/Domain/GeoLocation.cs
+++ b/src/Tests/Nest.Tests.MockData/Domain/GeoLocation.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest.Tests.MockData.Domain
 {
diff --git a/src/Tests/Nest.Tests.MockData/Domain/GeoShape.cs b/src/Tests/Nest.Tests.MockData/Domain/GeoShape.cs
index a581ddc8ee6..105d77ff047 100644
--- a/src/Tests/Nest.Tests.MockData/Domain/GeoShape.cs
+++ b/src/Tests/Nest.Tests.MockData/Domain/GeoShape.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest.Tests.MockData.Domain
 {
diff --git a/src/Tests/Nest.Tests.MockData/Domain/Person.cs b/src/Tests/Nest.Tests.MockData/Domain/Person.cs
index ab11aa9b90c..ec9e75dd7d9 100644
--- a/src/Tests/Nest.Tests.MockData/Domain/Person.cs
+++ b/src/Tests/Nest.Tests.MockData/Domain/Person.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest.Tests.MockData.Domain
 {
diff --git a/src/Tests/Nest.Tests.MockData/Domain/Product.cs b/src/Tests/Nest.Tests.MockData/Domain/Product.cs
index 9ed7af2fa81..b9072154fb5 100644
--- a/src/Tests/Nest.Tests.MockData/Domain/Product.cs
+++ b/src/Tests/Nest.Tests.MockData/Domain/Product.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest.Tests.MockData.Domain
 {
diff --git a/src/Tests/Nest.Tests.MockData/NestTestData.cs b/src/Tests/Nest.Tests.MockData/NestTestData.cs
index 2ed968521c7..9987ff5dd83 100644
--- a/src/Tests/Nest.Tests.MockData/NestTestData.cs
+++ b/src/Tests/Nest.Tests.MockData/NestTestData.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using AutoPoco.Engine;
 using AutoPoco;
 using Nest.Tests.MockData.Domain;
 using AutoPoco.DataSources;
-using AutoPoco.Configuration;
 using Nest.Tests.MockData.DataSources;
 
 namespace Nest.Tests.MockData
diff --git a/src/Tests/Nest.Tests.Unit/BaseJsonTests.cs b/src/Tests/Nest.Tests.Unit/BaseJsonTests.cs
index e03ca64ad54..4446f1c1699 100644
--- a/src/Tests/Nest.Tests.Unit/BaseJsonTests.cs
+++ b/src/Tests/Nest.Tests.Unit/BaseJsonTests.cs
@@ -1,22 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 using Elasticsearch.Net;
 using Elasticsearch.Net.Connection;
 using NUnit.Framework;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using Nest;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
-using Nest.Tests.MockData.Domain;
 using System.Reflection;
 using System.IO;
-using Moq;
-using PurifyNet;
 
 namespace Nest.Tests.Unit
 {
diff --git a/src/Tests/Nest.Tests.Unit/BigBadUrlUnitTests.cs b/src/Tests/Nest.Tests.Unit/BigBadUrlUnitTests.cs
index fc9368e85df..484ae16d30f 100644
--- a/src/Tests/Nest.Tests.Unit/BigBadUrlUnitTests.cs
+++ b/src/Tests/Nest.Tests.Unit/BigBadUrlUnitTests.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Linq;
-using System.Net;
-using System.Runtime.Remoting;
-using System.Security;
 using Elasticsearch.Net;
 using Elasticsearch.Net.Connection;
-using FakeItEasy;
 using FluentAssertions;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Unit/Core/AttributeBasedMap/BaseAttributeMappingTests.cs b/src/Tests/Nest.Tests.Unit/Core/AttributeBasedMap/BaseAttributeMappingTests.cs
index ae66a619ddd..797fb9c556a 100644
--- a/src/Tests/Nest.Tests.Unit/Core/AttributeBasedMap/BaseAttributeMappingTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/AttributeBasedMap/BaseAttributeMappingTests.cs
@@ -1,6 +1,5 @@
 using System;
 using Nest.Resolvers.Writers;
-using Nest.Resolvers;
 
 namespace Nest.Tests.Unit.Core.AttributeBasedMap
 {
diff --git a/src/Tests/Nest.Tests.Unit/Core/Bulk/BulkTests.cs b/src/Tests/Nest.Tests.Unit/Core/Bulk/BulkTests.cs
index ff90fc06f10..8a2f42407ab 100644
--- a/src/Tests/Nest.Tests.Unit/Core/Bulk/BulkTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/Bulk/BulkTests.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Net.NetworkInformation;
 using Elasticsearch.Net;
-using FluentAssertions;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
 using System.Reflection;
diff --git a/src/Tests/Nest.Tests.Unit/Core/Domain/Connection/ConnectionTests.cs b/src/Tests/Nest.Tests.Unit/Core/Domain/Connection/ConnectionTests.cs
index 676ca04dd98..ccf71a1d6ff 100644
--- a/src/Tests/Nest.Tests.Unit/Core/Domain/Connection/ConnectionTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/Domain/Connection/ConnectionTests.cs
@@ -1,5 +1,4 @@
-using System.Runtime.Remoting.Channels;
-using Elasticsearch.Net;
+using Elasticsearch.Net;
 using Elasticsearch.Net.Connection;
 using NUnit.Framework;
 using System;
diff --git a/src/Tests/Nest.Tests.Unit/Core/Get/GetTests.cs b/src/Tests/Nest.Tests.Unit/Core/Get/GetTests.cs
index ddf59a24ae1..36e26e93173 100644
--- a/src/Tests/Nest.Tests.Unit/Core/Get/GetTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/Get/GetTests.cs
@@ -1,15 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using NUnit.Framework;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using Nest;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
 using Nest.Tests.MockData.Domain;
 
 namespace Nest.Tests.Unit.Core.Get
diff --git a/src/Tests/Nest.Tests.Unit/Core/Index/IndexTests.cs b/src/Tests/Nest.Tests.Unit/Core/Index/IndexTests.cs
index 22d36712331..fcb4ca5ffcf 100644
--- a/src/Tests/Nest.Tests.Unit/Core/Index/IndexTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/Index/IndexTests.cs
@@ -1,15 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using NUnit.Framework;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using Nest;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
 using Nest.Tests.MockData.Domain;
 
 namespace Nest.Tests.Unit.Core.Index
diff --git a/src/Tests/Nest.Tests.Unit/Core/Indices/Analysis/Analyzers/AnalyzerTests.cs b/src/Tests/Nest.Tests.Unit/Core/Indices/Analysis/Analyzers/AnalyzerTests.cs
index a9e0e1f331d..fe1f2cdc5b3 100644
--- a/src/Tests/Nest.Tests.Unit/Core/Indices/Analysis/Analyzers/AnalyzerTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/Indices/Analysis/Analyzers/AnalyzerTests.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 
 namespace Nest.Tests.Unit.Core.Indices.Analysis.Analyzers
 {
diff --git a/src/Tests/Nest.Tests.Unit/Core/Indices/Analysis/BaseAnalysisTests.cs b/src/Tests/Nest.Tests.Unit/Core/Indices/Analysis/BaseAnalysisTests.cs
index 3686c381188..79ca55866fa 100644
--- a/src/Tests/Nest.Tests.Unit/Core/Indices/Analysis/BaseAnalysisTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/Indices/Analysis/BaseAnalysisTests.cs
@@ -1,8 +1,6 @@
 using System;
 using FluentAssertions;
 using NUnit.Framework;
-using Nest.Tests.MockData.Domain;
-using System.Reflection;
 
 namespace Nest.Tests.Unit.Core.Indices.Analysis.Tokenizers
 {
diff --git a/src/Tests/Nest.Tests.Unit/Core/Indices/Analysis/Tokenizers/TokenizerTests.cs b/src/Tests/Nest.Tests.Unit/Core/Indices/Analysis/Tokenizers/TokenizerTests.cs
index 8a4f1a451bd..c0c2d59fbb0 100644
--- a/src/Tests/Nest.Tests.Unit/Core/Indices/Analysis/Tokenizers/TokenizerTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/Indices/Analysis/Tokenizers/TokenizerTests.cs
@@ -1,5 +1,4 @@
 using NUnit.Framework;
-using Nest.Tests.MockData.Domain;
 using System.Reflection;
 
 namespace Nest.Tests.Unit.Core.Indices.Analysis.Tokenizers
diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/CustomMapping/ImagePluginMappingTests.cs b/src/Tests/Nest.Tests.Unit/Core/Map/CustomMapping/ImagePluginMappingTests.cs
index 0ce31a1ef21..ab29a9f88d4 100644
--- a/src/Tests/Nest.Tests.Unit/Core/Map/CustomMapping/ImagePluginMappingTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/Map/CustomMapping/ImagePluginMappingTests.cs
@@ -1,5 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Reflection;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/FluentMappingFullExampleTests.cs b/src/Tests/Nest.Tests.Unit/Core/Map/FluentMappingFullExampleTests.cs
index 0e13085f20a..9673e07be43 100644
--- a/src/Tests/Nest.Tests.Unit/Core/Map/FluentMappingFullExampleTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/Map/FluentMappingFullExampleTests.cs
@@ -1,15 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using NUnit.Framework;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using Nest;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
 using Nest.Tests.MockData.Domain;
 
 namespace Nest.Tests.Unit.Core.Map
diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/MappingBehaviourTests.cs b/src/Tests/Nest.Tests.Unit/Core/Map/MappingBehaviourTests.cs
index 0712e569f49..50edb3b756b 100644
--- a/src/Tests/Nest.Tests.Unit/Core/Map/MappingBehaviourTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/Map/MappingBehaviourTests.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
 using NUnit.Framework;
-using Nest;
 
 namespace Nest.Tests.Unit.Core.Map
 {
diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/PutMappingRequestTests.cs b/src/Tests/Nest.Tests.Unit/Core/Map/PutMappingRequestTests.cs
index 919624da6c3..435fef5ba8c 100644
--- a/src/Tests/Nest.Tests.Unit/Core/Map/PutMappingRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/Map/PutMappingRequestTests.cs
@@ -1,15 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using NUnit.Framework;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using Nest;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
 using Nest.Tests.MockData.Domain;
 
 namespace Nest.Tests.Unit.Core.Map
diff --git a/src/Tests/Nest.Tests.Unit/Core/MultiSearch/MultiSearchTests.cs b/src/Tests/Nest.Tests.Unit/Core/MultiSearch/MultiSearchTests.cs
index 3307583ffd1..b437fb971f9 100644
--- a/src/Tests/Nest.Tests.Unit/Core/MultiSearch/MultiSearchTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/MultiSearch/MultiSearchTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using Elasticsearch.Net;
 using FluentAssertions;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Unit/Core/Template/PutTemplateRequestTests.cs b/src/Tests/Nest.Tests.Unit/Core/Template/PutTemplateRequestTests.cs
index 79a51cbf965..62225d8666d 100644
--- a/src/Tests/Nest.Tests.Unit/Core/Template/PutTemplateRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/Template/PutTemplateRequestTests.cs
@@ -1,16 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using NUnit.Framework;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using Nest;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
-using Nest.Tests.MockData.Domain;
 
 namespace Nest.Tests.Unit.Core.Template
 {
diff --git a/src/Tests/Nest.Tests.Unit/Core/UpdateSettings/UpdateSettingsTests.cs b/src/Tests/Nest.Tests.Unit/Core/UpdateSettings/UpdateSettingsTests.cs
index 1f26b155a26..d4823019e87 100644
--- a/src/Tests/Nest.Tests.Unit/Core/UpdateSettings/UpdateSettingsTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/UpdateSettings/UpdateSettingsTests.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Reflection;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.Core.UpdateSettings
diff --git a/src/Tests/Nest.Tests.Unit/Core/Versioning/VersioningTests.cs b/src/Tests/Nest.Tests.Unit/Core/Versioning/VersioningTests.cs
index 9507ff6d403..b45b38afeaa 100644
--- a/src/Tests/Nest.Tests.Unit/Core/Versioning/VersioningTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/Versioning/VersioningTests.cs
@@ -1,15 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using NUnit.Framework;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using Nest;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
 using Nest.Tests.MockData.Domain;
 
 namespace Nest.Tests.Unit.Core.Versioning
diff --git a/src/Tests/Nest.Tests.Unit/Core/Warmers/PutWarmerRequestTests.cs b/src/Tests/Nest.Tests.Unit/Core/Warmers/PutWarmerRequestTests.cs
index abb62fff49b..46260bce554 100644
--- a/src/Tests/Nest.Tests.Unit/Core/Warmers/PutWarmerRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Core/Warmers/PutWarmerRequestTests.cs
@@ -1,15 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using NUnit.Framework;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using Nest;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
 using Nest.Tests.MockData.Domain;
 
 namespace Nest.Tests.Unit.Core.Template
diff --git a/src/Tests/Nest.Tests.Unit/Extensions.cs b/src/Tests/Nest.Tests.Unit/Extensions.cs
index 60f64172e40..548bcaa3b38 100644
--- a/src/Tests/Nest.Tests.Unit/Extensions.cs
+++ b/src/Tests/Nest.Tests.Unit/Extensions.cs
@@ -2,8 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using NUnit.Framework;
 
 namespace Nest.Tests.Unit
 {
diff --git a/src/Tests/Nest.Tests.Unit/Internals/Inferno/EscapedFormatTests.cs b/src/Tests/Nest.Tests.Unit/Internals/Inferno/EscapedFormatTests.cs
index ec16ac3d8e7..27a397d1cf7 100644
--- a/src/Tests/Nest.Tests.Unit/Internals/Inferno/EscapedFormatTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Internals/Inferno/EscapedFormatTests.cs
@@ -1,8 +1,5 @@
 using NUnit.Framework;
-using Nest.Tests.MockData.Domain;
-using Nest.Resolvers;
 using System;
-using FluentAssertions;
 using Elasticsearch.Net;
 
 namespace Nest.Tests.Unit.Internals.Inferno
diff --git a/src/Tests/Nest.Tests.Unit/Internals/Inferno/HostNameWithPathTests.cs b/src/Tests/Nest.Tests.Unit/Internals/Inferno/HostNameWithPathTests.cs
index 1e27662b31c..cb4a4a018ac 100644
--- a/src/Tests/Nest.Tests.Unit/Internals/Inferno/HostNameWithPathTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Internals/Inferno/HostNameWithPathTests.cs
@@ -1,8 +1,6 @@
-using Elasticsearch.Net;
-using Elasticsearch.Net.Connection;
+using Elasticsearch.Net.Connection;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using Nest.Resolvers;
 using System;
 using FluentAssertions;
 
diff --git a/src/Tests/Nest.Tests.Unit/Internals/Inferno/MapTypeNamesTests.cs b/src/Tests/Nest.Tests.Unit/Internals/Inferno/MapTypeNamesTests.cs
index c251bd851ff..a1b76d2763c 100644
--- a/src/Tests/Nest.Tests.Unit/Internals/Inferno/MapTypeNamesTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Internals/Inferno/MapTypeNamesTests.cs
@@ -1,6 +1,4 @@
 using NUnit.Framework;
-using Nest.Tests.MockData.Domain;
-using Nest.Resolvers;
 using FluentAssertions;
 
 namespace Nest.Tests.Unit.Internals.Inferno
diff --git a/src/Tests/Nest.Tests.Unit/Internals/Inferno/PropertyNameResolverTests.cs b/src/Tests/Nest.Tests.Unit/Internals/Inferno/PropertyNameResolverTests.cs
index 512035ebbe1..2960e643f3b 100644
--- a/src/Tests/Nest.Tests.Unit/Internals/Inferno/PropertyNameResolverTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Internals/Inferno/PropertyNameResolverTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Runtime.Remoting.Channels;
 using Elasticsearch.Net;
 using NUnit.Framework;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 using Newtonsoft.Json;
 
 namespace Nest.Tests.Unit.Internals.Inferno
diff --git a/src/Tests/Nest.Tests.Unit/Internals/Serialize/ConnectionSettingsTests.cs b/src/Tests/Nest.Tests.Unit/Internals/Serialize/ConnectionSettingsTests.cs
index 1d876ef6668..b0e09c222d2 100644
--- a/src/Tests/Nest.Tests.Unit/Internals/Serialize/ConnectionSettingsTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Internals/Serialize/ConnectionSettingsTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Newtonsoft.Json;
diff --git a/src/Tests/Nest.Tests.Unit/Internals/Serialize/SerializeTests.cs b/src/Tests/Nest.Tests.Unit/Internals/Serialize/SerializeTests.cs
index 0a09be43a57..0bc743a5fa8 100644
--- a/src/Tests/Nest.Tests.Unit/Internals/Serialize/SerializeTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Internals/Serialize/SerializeTests.cs
@@ -4,7 +4,6 @@
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
 using Elasticsearch.Net;
-using Newtonsoft.Json;
 
 namespace Nest.Tests.Unit.Internals.Serialize
 {
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/AliasRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/AliasRequestTests.cs
index 710a27b13f2..c2993e5b59d 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/AliasRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/AliasRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Aliases
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasMoreUrlTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasMoreUrlTests.cs
index 567a35ae6c9..ec0ae5837de 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasMoreUrlTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasMoreUrlTests.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Aliases
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasRequestTests.cs
index 8c8a8a70d5f..406b234b70d 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Aliases
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasesMoreUrlTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasesMoreUrlTests.cs
index cb143abab54..6523b5c1899 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasesMoreUrlTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasesMoreUrlTests.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Aliases
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasesRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasesRequestTests.cs
index 4923059ca16..04bdeadbe18 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasesRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/GetAliasesRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Aliases
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Analyze/AnalyzeRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Analyze/AnalyzeRequestTests.cs
index 00f2d4f5920..0099dc62097 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Analyze/AnalyzeRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Analyze/AnalyzeRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Resolvers;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Bulk/BulkRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Bulk/BulkRequestTests.cs
index 0b0714f093b..22d663bf763 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Bulk/BulkRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Bulk/BulkRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClearCache/ClearCacheRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClearCache/ClearCacheRequestTests.cs
index 0236e410fbe..9dd0cd17909 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClearCache/ClearCacheRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClearCache/ClearCacheRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Resolvers;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterHealth/ClusterHealthRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterHealth/ClusterHealthRequestTests.cs
index c222216cf49..9c7d7bc7b16 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterHealth/ClusterHealthRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterHealth/ClusterHealthRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.ClusterHealth
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterSettings/ClusterGetSettingsRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterSettings/ClusterGetSettingsRequestTests.cs
index c73cac7e7ac..afd78f1de77 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterSettings/ClusterGetSettingsRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterSettings/ClusterGetSettingsRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.ClusterHealth
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterSettings/ClusterSettingsRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterSettings/ClusterSettingsRequestTests.cs
index 9e424639c4d..90290d7602e 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterSettings/ClusterSettingsRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterSettings/ClusterSettingsRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.ClusterSettings
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterState/ClusterStateRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterState/ClusterStateRequestTests.cs
index 146dbf12a0e..b3cf7dcd2c4 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterState/ClusterStateRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/ClusterState/ClusterStateRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Tests.MockData.DataSources;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.ClusterState
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Count/CountRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Count/CountRequestTests.cs
index 712cc97793c..2245edb94ff 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Count/CountRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Count/CountRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Resolvers;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/CreateIndex/CreateIndexRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/CreateIndex/CreateIndexRequestTests.cs
index 457a9b83387..a2f62207afa 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/CreateIndex/CreateIndexRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/CreateIndex/CreateIndexRequestTests.cs
@@ -2,12 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Resolvers;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.CreateIndex
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Delete/DeleteRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Delete/DeleteRequestTests.cs
index d37a74cf432..b1a09db77f3 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Delete/DeleteRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Delete/DeleteRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Delete
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteByQuery/DeleteByQueryRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteByQuery/DeleteByQueryRequestTests.cs
index 79b55d8336e..e61d8a4160a 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteByQuery/DeleteByQueryRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteByQuery/DeleteByQueryRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Resolvers;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteByQuery/DeleteByQueryRequestUrlTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteByQuery/DeleteByQueryRequestUrlTests.cs
index 38880a722df..1c5dad08949 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteByQuery/DeleteByQueryRequestUrlTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteByQuery/DeleteByQueryRequestUrlTests.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Resolvers;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteByQuery/DeleteByQueryTypedRequestUrlTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteByQuery/DeleteByQueryTypedRequestUrlTests.cs
index e6c812da0bb..e180bfbf34d 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteByQuery/DeleteByQueryTypedRequestUrlTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteByQuery/DeleteByQueryTypedRequestUrlTests.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Resolvers;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteIndex/DeleteIndexRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteIndex/DeleteIndexRequestTests.cs
index 0e87b6ed06d..dcb3c050863 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteIndex/DeleteIndexRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/DeleteIndex/DeleteIndexRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Exists/DocumentExistsRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Exists/DocumentExistsRequestTests.cs
index 198292aab08..8acbc3887b6 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Exists/DocumentExistsRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Exists/DocumentExistsRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Exists/IndexExistsRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Exists/IndexExistsRequestTests.cs
index 308ace69244..67899c254dd 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Exists/IndexExistsRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Exists/IndexExistsRequestTests.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Exists
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Flush/FlushRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Flush/FlushRequestTests.cs
index 61da1943797..68dcd0f9320 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Flush/FlushRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Flush/FlushRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.ClusterHealth
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Get/GetRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Get/GetRequestTests.cs
index dc13de2539c..50b852ad434 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Get/GetRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Get/GetRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Index/IndexRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Index/IndexRequestTests.cs
index 4e7daa5b0a4..cfe683d11ff 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Index/IndexRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Index/IndexRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/IndicesStats/IndicesStatsRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/IndicesStats/IndicesStatsRequestTests.cs
index 8081725885e..4d0aa2db2a0 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/IndicesStats/IndicesStatsRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/IndicesStats/IndicesStatsRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Resolvers;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Mapping/DeleteMappingRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Mapping/DeleteMappingRequestTests.cs
index 09fd49c7e51..2b7c6c13c44 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Mapping/DeleteMappingRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Mapping/DeleteMappingRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Mapping
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Mapping/GetMappingRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Mapping/GetMappingRequestTests.cs
index 1b2186a8717..4986dccd390 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Mapping/GetMappingRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Mapping/GetMappingRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Mapping
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Mapping/MapRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Mapping/MapRequestTests.cs
index 9cd6a7c1a92..1a1d92e8c16 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Mapping/MapRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Mapping/MapRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Mapping
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/MoreLikeThis/MoreLikeThisRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/MoreLikeThis/MoreLikeThisRequestTests.cs
index e0a4420bfd1..c6c8b9568f9 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/MoreLikeThis/MoreLikeThisRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/MoreLikeThis/MoreLikeThisRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Resolvers;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/MultiGet/MultiGetRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/MultiGet/MultiGetRequestTests.cs
index dd67976c5b8..cc49592b10e 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/MultiGet/MultiGetRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/MultiGet/MultiGetRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Resolvers;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/MultiSearch/MultiSearchRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/MultiSearch/MultiSearchRequestTests.cs
index f6a135247ab..c1388f515d9 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/MultiSearch/MultiSearchRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/MultiSearch/MultiSearchRequestTests.cs
@@ -2,11 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Resolvers;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/MultiTermVectors/MultiTermVectorsRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/MultiTermVectors/MultiTermVectorsRequestTests.cs
index 6673b0cbe65..dfb30468b93 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/MultiTermVectors/MultiTermVectorsRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/MultiTermVectors/MultiTermVectorsRequestTests.cs
@@ -3,11 +3,8 @@
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.MultiTermVectors
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Nodes/NodeStatsRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Nodes/NodeStatsRequestTests.cs
index 12598c66041..79c156f7493 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Nodes/NodeStatsRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Nodes/NodeStatsRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Resolvers;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Nodes/NodesInfoRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Nodes/NodesInfoRequestTests.cs
index f5f034b3d39..0a978ca5906 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Nodes/NodesInfoRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Nodes/NodesInfoRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Nodes
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/OpenClose/CloseIndexRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/OpenClose/CloseIndexRequestTests.cs
index 8ef388bfd82..0844ca1bfcd 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/OpenClose/CloseIndexRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/OpenClose/CloseIndexRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/OpenClose/OpenIndexRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/OpenClose/OpenIndexRequestTests.cs
index 8c477272b7c..70365245b35 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/OpenClose/OpenIndexRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/OpenClose/OpenIndexRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Optimize/OptimizeRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Optimize/OptimizeRequestTests.cs
index d4e0880774c..c11df1643f8 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Optimize/OptimizeRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Optimize/OptimizeRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Percolate/PercolateRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Percolate/PercolateRequestTests.cs
index 4574d9b4053..41ac75ad33d 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Percolate/PercolateRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Percolate/PercolateRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Percolate/RegisterPercolatorRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Percolate/RegisterPercolatorRequestTests.cs
index 15f3caab928..2d7c39755ed 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Percolate/RegisterPercolatorRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Percolate/RegisterPercolatorRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Percolate/UnregisterPercolatorRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Percolate/UnregisterPercolatorRequestTests.cs
index 8358a8deb81..2c413d618d5 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Percolate/UnregisterPercolatorRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Percolate/UnregisterPercolatorRequestTests.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Percolate
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Refresh/RefreshRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Refresh/RefreshRequestTests.cs
index cbb5fe4b8c1..cf1939635ac 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Refresh/RefreshRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Refresh/RefreshRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Refresh
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Repository/CreateRepositoryRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Repository/CreateRepositoryRequestTests.cs
index d85caa1a644..0f57b4f4834 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Repository/CreateRepositoryRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Repository/CreateRepositoryRequestTests.cs
@@ -2,11 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Repository
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Repository/DeleteRepositoryRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Repository/DeleteRepositoryRequestTests.cs
index da6bce1b271..108c37f7563 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Repository/DeleteRepositoryRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Repository/DeleteRepositoryRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Repository
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Restore/RestoreRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Restore/RestoreRequestTests.cs
index 29a4b5bcabd..390892ce842 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Restore/RestoreRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Restore/RestoreRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Restore
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/RootNodeInfo/RootNodeInfoRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/RootNodeInfo/RootNodeInfoRequestTests.cs
index 2abd96355c1..0819cf2f7bf 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/RootNodeInfo/RootNodeInfoRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/RootNodeInfo/RootNodeInfoRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.RootNodeInfo
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Scroll/ClearScrollRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Scroll/ClearScrollRequestTests.cs
index ffd8b1b5329..4c1563479d0 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Scroll/ClearScrollRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Scroll/ClearScrollRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Scroll
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Scroll/ScrollRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Scroll/ScrollRequestTests.cs
index 0c9621a0a3e..07609186a98 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Scroll/ScrollRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Scroll/ScrollRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Search/SearchRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Search/SearchRequestTests.cs
index 64802ad5f37..388abcaf682 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Search/SearchRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Search/SearchRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Resolvers;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Segments/SegmentsRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Segments/SegmentsRequestTests.cs
index 3ac3b18f08c..a0b71819218 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Segments/SegmentsRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Segments/SegmentsRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.ClusterHealth
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshot/DeleteSnapshotRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshot/DeleteSnapshotRequestTests.cs
index 41aca90ebce..b6af2716037 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshot/DeleteSnapshotRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshot/DeleteSnapshotRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Snapshot
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshot/GetSnapshotRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshot/GetSnapshotRequestTests.cs
index 7a50c341b4d..dc5fa53eec2 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshot/GetSnapshotRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshot/GetSnapshotRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Snapshot
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshot/SnapshotRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshot/SnapshotRequestTests.cs
index 564735c77d2..a9e4052b5fe 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshot/SnapshotRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshot/SnapshotRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Snapshot
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/CreateRepositoryRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/CreateRepositoryRequestTests.cs
index 77a06481c74..b10211da22b 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/CreateRepositoryRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/CreateRepositoryRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Snapshots
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/DeleteRepositoryRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/DeleteRepositoryRequestTests.cs
index c5950062800..a687c632cbd 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/DeleteRepositoryRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/DeleteRepositoryRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Snapshots
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/DeleteSnapshotRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/DeleteSnapshotRequestTests.cs
index 60274bd4ad7..ac7f981406c 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/DeleteSnapshotRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/DeleteSnapshotRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Snapshots
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/GetSnapshotRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/GetSnapshotRequestTests.cs
index ec0a9ecc2c4..8f1dc7d8f31 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/GetSnapshotRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/GetSnapshotRequestTests.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Snapshots
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/RestoreRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/RestoreRequestTests.cs
index 7d398e45b8c..5157a267895 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/RestoreRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/RestoreRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Snapshots
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/SnapshotRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/SnapshotRequestTests.cs
index 6a678d2844c..d07e515cc08 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/SnapshotRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Snapshots/SnapshotRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Snapshots
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Source/SourceRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Source/SourceRequestTests.cs
index 89888c6debb..69dd0c3a70f 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Source/SourceRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Source/SourceRequestTests.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using Elasticsearch.Net.Connection;
 using FluentAssertions;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Status/StatusRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Status/StatusRequestTests.cs
index e017eee49b8..968bb1f9357 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Status/StatusRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Status/StatusRequestTests.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
-using Nest.Resolvers;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.IndicesStats
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Suggest/SuggestRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Suggest/SuggestRequestTests.cs
index e760f62ac11..ea4228fd705 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Suggest/SuggestRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Suggest/SuggestRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Resolvers;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Template/DeleteTemplateRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Template/DeleteTemplateRequestTests.cs
index 9b20505ed9f..02fb4d1c22f 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Template/DeleteTemplateRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Template/DeleteTemplateRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Template
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Template/GetTemplateRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Template/GetTemplateRequestTests.cs
index 139b858a980..7b0e52de5ba 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Template/GetTemplateRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Template/GetTemplateRequestTests.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Template
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Template/PutTemplateRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Template/PutTemplateRequestTests.cs
index 28ea32db47d..ab9a185fdb7 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Template/PutTemplateRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Template/PutTemplateRequestTests.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/TermVector/TermVectorRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/TermVector/TermVectorRequestTests.cs
index 87b5b2ed724..8a82c042ae9 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/TermVector/TermVectorRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/TermVector/TermVectorRequestTests.cs
@@ -4,9 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest.Tests.Unit.ObjectInitializer.TermVector
 {
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Update/UpdateRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Update/UpdateRequestTests.cs
index de761fe2b5f..89fb6f34dcd 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Update/UpdateRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Update/UpdateRequestTests.cs
@@ -6,8 +6,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Update
 {
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/UpdateSettings/UpdateSettingsRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/UpdateSettings/UpdateSettingsRequestTests.cs
index 16a3c9dd314..0903c535f42 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/UpdateSettings/UpdateSettingsRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/UpdateSettings/UpdateSettingsRequestTests.cs
@@ -5,8 +5,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest.Tests.Unit.ObjectInitializer.UpdateSettings
 {
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Validate/ValidateQueryRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Validate/ValidateQueryRequestTests.cs
index 572009bebec..7c0e4ecc991 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Validate/ValidateQueryRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Validate/ValidateQueryRequestTests.cs
@@ -1,6 +1,5 @@
 using Elasticsearch.Net;
 using FluentAssertions;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Warmers/DeleteWarmerRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Warmers/DeleteWarmerRequestTests.cs
index 1eceab1410e..779653ba693 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Warmers/DeleteWarmerRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Warmers/DeleteWarmerRequestTests.cs
@@ -4,9 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Warmers
 {
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Warmers/GetWarmerRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Warmers/GetWarmerRequestTests.cs
index b465c4e230b..581639b1d2f 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Warmers/GetWarmerRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Warmers/GetWarmerRequestTests.cs
@@ -4,8 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Warmers
 {
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Warmers/PutWarmerRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Warmers/PutWarmerRequestTests.cs
index c81a738f2f9..4967baca3f2 100644
--- a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Warmers/PutWarmerRequestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Warmers/PutWarmerRequestTests.cs
@@ -5,8 +5,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Nest.Tests.Unit.ObjectInitializer.Warmers
 {
diff --git a/src/Tests/Nest.Tests.Unit/QueryParsers/Filter/ParseFilterTests.cs b/src/Tests/Nest.Tests.Unit/QueryParsers/Filter/ParseFilterTests.cs
index 62896337696..0aecda9c5d1 100644
--- a/src/Tests/Nest.Tests.Unit/QueryParsers/Filter/ParseFilterTests.cs
+++ b/src/Tests/Nest.Tests.Unit/QueryParsers/Filter/ParseFilterTests.cs
@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Runtime;
-using Elasticsearch.Net;
 using FluentAssertions;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Unit/QueryParsers/Queries/ParseQueryTestsBase.cs b/src/Tests/Nest.Tests.Unit/QueryParsers/Queries/ParseQueryTestsBase.cs
index 2d24ddc8203..477c7b3fbd7 100644
--- a/src/Tests/Nest.Tests.Unit/QueryParsers/Queries/ParseQueryTestsBase.cs
+++ b/src/Tests/Nest.Tests.Unit/QueryParsers/Queries/ParseQueryTestsBase.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using FakeItEasy;
 using FluentAssertions;
 using Nest.Tests.MockData.Domain;
 
diff --git a/src/Tests/Nest.Tests.Unit/QueryParsers/Visitor/DslPrettyPrintVisitor.cs b/src/Tests/Nest.Tests.Unit/QueryParsers/Visitor/DslPrettyPrintVisitor.cs
index 5531caa7011..12a3330d340 100644
--- a/src/Tests/Nest.Tests.Unit/QueryParsers/Visitor/DslPrettyPrintVisitor.cs
+++ b/src/Tests/Nest.Tests.Unit/QueryParsers/Visitor/DslPrettyPrintVisitor.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using Nest.DSL.Visitor;
-using Nest.Resolvers;
 
 namespace Nest.Tests.Unit.QueryParsers.Visitor
 {
diff --git a/src/Tests/Nest.Tests.Unit/QueryParsers/Visitor/VisitorDemoUseCase.cs b/src/Tests/Nest.Tests.Unit/QueryParsers/Visitor/VisitorDemoUseCase.cs
index c7f9bc6b077..cc40851e134 100644
--- a/src/Tests/Nest.Tests.Unit/QueryParsers/Visitor/VisitorDemoUseCase.cs
+++ b/src/Tests/Nest.Tests.Unit/QueryParsers/Visitor/VisitorDemoUseCase.cs
@@ -1,10 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using FakeItEasy;
-using FluentAssertions;
-using Nest.DSL.Visitor;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/QueryParsers/Visitor/VisitorTests.cs b/src/Tests/Nest.Tests.Unit/QueryParsers/Visitor/VisitorTests.cs
index 742b34b0496..cd0bf2f6720 100644
--- a/src/Tests/Nest.Tests.Unit/QueryParsers/Visitor/VisitorTests.cs
+++ b/src/Tests/Nest.Tests.Unit/QueryParsers/Visitor/VisitorTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using FakeItEasy;
 using FluentAssertions;
 using Nest.DSL.Visitor;
diff --git a/src/Tests/Nest.Tests.Unit/Reproduce/Reproduce646Tests.cs b/src/Tests/Nest.Tests.Unit/Reproduce/Reproduce646Tests.cs
index 09a3a569f0b..39a7cba6077 100644
--- a/src/Tests/Nest.Tests.Unit/Reproduce/Reproduce646Tests.cs
+++ b/src/Tests/Nest.Tests.Unit/Reproduce/Reproduce646Tests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using Elasticsearch.Net.Connection;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/Search/Fields/FieldsTests.cs b/src/Tests/Nest.Tests.Unit/Search/Fields/FieldsTests.cs
index 93163f381f9..012db4eceb1 100644
--- a/src/Tests/Nest.Tests.Unit/Search/Fields/FieldsTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Search/Fields/FieldsTests.cs
@@ -1,14 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Security;
-using System.Text;
-using Elasticsearch.Net.Connection;
 using FluentAssertions;
-using Nest;
-using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
 namespace Nest.Tests.Unit.Search.Fields
diff --git a/src/Tests/Nest.Tests.Unit/Search/InitializerSyntax/InitializerExample.cs b/src/Tests/Nest.Tests.Unit/Search/InitializerSyntax/InitializerExample.cs
index 884549d9519..a5b6d89622f 100644
--- a/src/Tests/Nest.Tests.Unit/Search/InitializerSyntax/InitializerExample.cs
+++ b/src/Tests/Nest.Tests.Unit/Search/InitializerSyntax/InitializerExample.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
-using FakeItEasy;
-using Nest;
-using Nest.DSL.Descriptors;
 using Nest.Resolvers;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
diff --git a/src/Tests/Nest.Tests.Unit/Search/Query/Singles/RegexpQueryJson.cs b/src/Tests/Nest.Tests.Unit/Search/Query/Singles/RegexpQueryJson.cs
index 99903a91b31..8f293117e3d 100644
--- a/src/Tests/Nest.Tests.Unit/Search/Query/Singles/RegexpQueryJson.cs
+++ b/src/Tests/Nest.Tests.Unit/Search/Query/Singles/RegexpQueryJson.cs
@@ -1,6 +1,5 @@
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
-using Elasticsearch.Net;
 
 namespace Nest.Tests.Unit.Search.Query.Singles
 {
diff --git a/src/Tests/Nest.Tests.Unit/Search/Query/Singles/Terms/TermsQueryJson.cs b/src/Tests/Nest.Tests.Unit/Search/Query/Singles/Terms/TermsQueryJson.cs
index 07f560da828..a406ee464f3 100644
--- a/src/Tests/Nest.Tests.Unit/Search/Query/Singles/Terms/TermsQueryJson.cs
+++ b/src/Tests/Nest.Tests.Unit/Search/Query/Singles/Terms/TermsQueryJson.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using FakeItEasy;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
 
diff --git a/src/Tests/Nest.Tests.Unit/Search/Rescoring/RescoreTests.cs b/src/Tests/Nest.Tests.Unit/Search/Rescoring/RescoreTests.cs
index 4d64e0ce12a..4030e92904c 100644
--- a/src/Tests/Nest.Tests.Unit/Search/Rescoring/RescoreTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Search/Rescoring/RescoreTests.cs
@@ -1,16 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using NUnit.Framework;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using Nest;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
 using Nest.Tests.MockData.Domain;
-using Nest.Resolvers;
 
 namespace Nest.Tests.Unit.Search.Rescoring
 {
diff --git a/src/Tests/Nest.Tests.Unit/Search/ScriptFields/ScriptFieldTests.cs b/src/Tests/Nest.Tests.Unit/Search/ScriptFields/ScriptFieldTests.cs
index f6afc2c1c0c..5b365deed82 100644
--- a/src/Tests/Nest.Tests.Unit/Search/ScriptFields/ScriptFieldTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Search/ScriptFields/ScriptFieldTests.cs
@@ -1,14 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using NUnit.Framework;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using Nest;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
 using Nest.Tests.MockData.Domain;
 
 namespace Nest.Tests.Unit.Search.ScriptFields
diff --git a/src/Tests/Nest.Tests.Unit/Search/SearchTypeTests/ScriptFieldTests.cs b/src/Tests/Nest.Tests.Unit/Search/SearchTypeTests/ScriptFieldTests.cs
index 392c93975d6..e277b28e4da 100644
--- a/src/Tests/Nest.Tests.Unit/Search/SearchTypeTests/ScriptFieldTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Search/SearchTypeTests/ScriptFieldTests.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Elasticsearch.Net;
-using Nest;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
diff --git a/src/Tests/Nest.Tests.Unit/Search/suggest/CompletionSuggestTests.cs b/src/Tests/Nest.Tests.Unit/Search/suggest/CompletionSuggestTests.cs
index 41031303968..a112c1a75e4 100644
--- a/src/Tests/Nest.Tests.Unit/Search/suggest/CompletionSuggestTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Search/suggest/CompletionSuggestTests.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Nest.Tests.Unit.Search.Suggest
 {