diff --git a/json-path/src/main/java/com/jayway/jsonpath/Criteria.java b/json-path/src/main/java/com/jayway/jsonpath/Criteria.java
index 34552521..adca5392 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/Criteria.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/Criteria.java
@@ -2,9 +2,7 @@ package com.jayway.jsonpath;
 
 import com.jayway.jsonpath.internal.Path;
 import com.jayway.jsonpath.internal.PathCompiler;
-
 import com.jayway.jsonpath.internal.compiler.PredicateContextImpl;
-import com.sun.tools.doclets.formats.html.SourceToHTMLConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/json-path/src/main/java/com/jayway/jsonpath/spi/json/JsonProvider.java b/json-path/src/main/java/com/jayway/jsonpath/spi/json/JsonProvider.java
index 45ed5dd4..e5ac92fc 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/spi/json/JsonProvider.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/spi/json/JsonProvider.java
@@ -15,7 +15,6 @@
 package com.jayway.jsonpath.spi.json;
 
 import com.jayway.jsonpath.InvalidJsonException;
-import com.jayway.jsonpath.ValueCompareException;
 
 import java.io.InputStream;
 import java.util.Collection;
diff --git a/json-path/src/test/java/com/jayway/jsonpath/BaseTest.java b/json-path/src/test/java/com/jayway/jsonpath/BaseTest.java
index fd72c748..771ba948 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/BaseTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/BaseTest.java
@@ -1,13 +1,6 @@
 package com.jayway.jsonpath;
 
 import com.jayway.jsonpath.internal.compiler.PredicateContextImpl;
-import com.jayway.jsonpath.internal.spi.converter.DefaultConversionProvider;
-import com.jayway.jsonpath.internal.spi.json.GsonProvider;
-import com.jayway.jsonpath.spi.converter.ConversionProvider;
-import com.jayway.jsonpath.spi.json.JsonProvider;
-
-import java.util.EnumSet;
-import java.util.Set;
 
 public class BaseTest {
     /*
diff --git a/json-path/src/test/java/com/jayway/jsonpath/ConverterTest.java b/json-path/src/test/java/com/jayway/jsonpath/ConverterTest.java
index 6be41fb3..7b0c439e 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/ConverterTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/ConverterTest.java
@@ -1,18 +1,10 @@
 package com.jayway.jsonpath;
 
-import com.jayway.jsonpath.internal.spi.converter.DefaultConversionProvider;
-import com.jayway.jsonpath.internal.spi.json.GsonProvider;
-import com.jayway.jsonpath.spi.converter.ConversionProvider;
-import com.jayway.jsonpath.spi.json.JsonProvider;
 import org.junit.Test;
 
-import java.math.BigDecimal;
 import java.util.Date;
-import java.util.EnumSet;
-import java.util.Set;
 
 import static com.jayway.jsonpath.JsonPath.parse;
-import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class ConverterTest extends BaseTest {
diff --git a/json-path/src/test/java/com/jayway/jsonpath/OptionsTest.java b/json-path/src/test/java/com/jayway/jsonpath/OptionsTest.java
index 88ffac7a..c480a48d 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/OptionsTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/OptionsTest.java
@@ -7,10 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.jayway.jsonpath.JsonPath.using;
-import static com.jayway.jsonpath.Option.ALWAYS_RETURN_LIST;
-import static com.jayway.jsonpath.Option.AS_PATH_LIST;
-import static com.jayway.jsonpath.Option.DEFAULT_PATH_LEAF_TO_NULL;
-import static java.util.Collections.singletonMap;
+import static com.jayway.jsonpath.Option.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class OptionsTest extends BaseTest {
diff --git a/json-path/src/test/java/com/jayway/jsonpath/old/FilterTest.java b/json-path/src/test/java/com/jayway/jsonpath/old/FilterTest.java
index 15f9620d..60515dc3 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/old/FilterTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/old/FilterTest.java
@@ -8,7 +8,6 @@ import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.Predicate;
 import com.jayway.jsonpath.internal.spi.json.JsonSmartJsonProvider;
 import com.jayway.jsonpath.spi.json.JsonProvider;
-
 import org.junit.Test;
 
 import java.util.Collections;
diff --git a/json-path/src/test/java/com/jayway/jsonpath/old/IssuesTest.java b/json-path/src/test/java/com/jayway/jsonpath/old/IssuesTest.java
index 2ca29059..4166490d 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/old/IssuesTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/old/IssuesTest.java
@@ -9,7 +9,6 @@ import com.jayway.jsonpath.PathNotFoundException;
 import com.jayway.jsonpath.internal.Utils;
 import com.jayway.jsonpath.internal.spi.json.JsonSmartJsonProvider;
 import com.jayway.jsonpath.spi.json.JsonProvider;
-
 import org.assertj.core.api.Assertions;
 import org.hamcrest.Matchers;
 import org.junit.Test;
diff --git a/json-path/src/test/java/com/jayway/jsonpath/old/JsonPathTest.java b/json-path/src/test/java/com/jayway/jsonpath/old/JsonPathTest.java
index 7c7da71f..893f00a9 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/old/JsonPathTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/old/JsonPathTest.java
@@ -5,8 +5,6 @@ import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.PathNotFoundException;
 import com.jayway.jsonpath.internal.PathCompiler;
-import com.jayway.jsonpath.internal.spi.json.JsonSmartJsonProvider;
-
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
diff --git a/json-path/src/test/java/com/jayway/jsonpath/old/internal/PredicatePathTokenTest.java b/json-path/src/test/java/com/jayway/jsonpath/old/internal/PredicatePathTokenTest.java
index 5854ce98..abfafa77 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/old/internal/PredicatePathTokenTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/old/internal/PredicatePathTokenTest.java
@@ -2,7 +2,6 @@ package com.jayway.jsonpath.old.internal;
 
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.internal.spi.json.JsonSmartJsonProvider;
-
 import org.junit.Test;
 
 import java.util.List;
diff --git a/json-path/src/test/java/com/jayway/jsonpath/old/internal/ScanPathTokenTest.java b/json-path/src/test/java/com/jayway/jsonpath/old/internal/ScanPathTokenTest.java
index a3f18e0b..c329c297 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/old/internal/ScanPathTokenTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/old/internal/ScanPathTokenTest.java
@@ -4,7 +4,6 @@ import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.internal.PathCompiler;
 import com.jayway.jsonpath.internal.spi.json.JsonSmartJsonProvider;
-
 import org.junit.Ignore;
 import org.junit.Test;