diff --git a/core/src/main/java/org/everit/json/schema/ArraySchema.java b/core/src/main/java/org/everit/json/schema/ArraySchema.java
index 44bcd3852..04186c4fc 100644
--- a/core/src/main/java/org/everit/json/schema/ArraySchema.java
+++ b/core/src/main/java/org/everit/json/schema/ArraySchema.java
@@ -17,7 +17,6 @@
 
 import org.everit.json.schema.internal.JSONPrinter;
 import org.json.JSONArray;
-import org.json.JSONWriter;
 
 import java.util.*;
 import java.util.function.Consumer;
diff --git a/core/src/main/java/org/everit/json/schema/EnumSchema.java b/core/src/main/java/org/everit/json/schema/EnumSchema.java
index 02e81002c..2ef4e5b2f 100644
--- a/core/src/main/java/org/everit/json/schema/EnumSchema.java
+++ b/core/src/main/java/org/everit/json/schema/EnumSchema.java
@@ -16,7 +16,6 @@
 package org.everit.json.schema;
 
 import org.everit.json.schema.internal.JSONPrinter;
-import org.json.JSONWriter;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/core/src/main/java/org/everit/json/schema/FormatValidator.java b/core/src/main/java/org/everit/json/schema/FormatValidator.java
index 869336425..c606a363a 100644
--- a/core/src/main/java/org/everit/json/schema/FormatValidator.java
+++ b/core/src/main/java/org/everit/json/schema/FormatValidator.java
@@ -17,7 +17,6 @@
 
 import org.everit.json.schema.internal.*;
 
-import java.util.Objects;
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
diff --git a/core/src/main/java/org/everit/json/schema/internal/JSONPrinter.java b/core/src/main/java/org/everit/json/schema/internal/JSONPrinter.java
index cbf18b83a..df7906536 100644
--- a/core/src/main/java/org/everit/json/schema/internal/JSONPrinter.java
+++ b/core/src/main/java/org/everit/json/schema/internal/JSONPrinter.java
@@ -4,7 +4,6 @@
 import org.json.JSONWriter;
 
 import java.io.Writer;
-import java.util.HashMap;
 import java.util.Map;
 
 import static java.util.Objects.requireNonNull;
diff --git a/core/src/main/java/org/everit/json/schema/loader/LoadingState.java b/core/src/main/java/org/everit/json/schema/loader/LoadingState.java
index ca6efbb24..df126b474 100644
--- a/core/src/main/java/org/everit/json/schema/loader/LoadingState.java
+++ b/core/src/main/java/org/everit/json/schema/loader/LoadingState.java
@@ -2,7 +2,6 @@
 
 import org.everit.json.schema.FormatValidator;
 import org.everit.json.schema.ReferenceSchema;
-import org.everit.json.schema.Schema;
 import org.everit.json.schema.SchemaException;
 import org.everit.json.schema.loader.internal.TypeBasedMultiplexer;
 import org.json.JSONObject;
diff --git a/core/src/main/java/org/everit/json/schema/loader/ObjectSchemaLoader.java b/core/src/main/java/org/everit/json/schema/loader/ObjectSchemaLoader.java
index 0f6996c9f..17c531b80 100644
--- a/core/src/main/java/org/everit/json/schema/loader/ObjectSchemaLoader.java
+++ b/core/src/main/java/org/everit/json/schema/loader/ObjectSchemaLoader.java
@@ -1,12 +1,10 @@
 package org.everit.json.schema.loader;
 
 import org.everit.json.schema.ObjectSchema;
-import org.everit.json.schema.SchemaException;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.Arrays;
-import java.util.function.Consumer;
 import java.util.stream.IntStream;
 
 import static java.util.Objects.requireNonNull;
diff --git a/core/src/main/java/org/everit/json/schema/loader/internal/JSONPointer.java b/core/src/main/java/org/everit/json/schema/loader/internal/JSONPointer.java
index 7ab1cda3b..d000cc996 100644
--- a/core/src/main/java/org/everit/json/schema/loader/internal/JSONPointer.java
+++ b/core/src/main/java/org/everit/json/schema/loader/internal/JSONPointer.java
@@ -24,7 +24,6 @@
 
 import java.io.*;
 import java.nio.charset.Charset;
-import java.util.Objects;
 import java.util.function.Supplier;
 
 import static java.util.Objects.requireNonNull;
diff --git a/core/src/test/java/org/everit/json/schema/ArraySchemaTest.java b/core/src/test/java/org/everit/json/schema/ArraySchemaTest.java
index f5e43c41a..f98529f45 100644
--- a/core/src/test/java/org/everit/json/schema/ArraySchemaTest.java
+++ b/core/src/test/java/org/everit/json/schema/ArraySchemaTest.java
@@ -19,11 +19,8 @@
 import nl.jqno.equalsverifier.Warning;
 import org.everit.json.schema.loader.SchemaLoader;
 import org.json.JSONObject;
-import org.json.JSONTokener;
-import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
diff --git a/core/src/test/java/org/everit/json/schema/CombinedSchemaTest.java b/core/src/test/java/org/everit/json/schema/CombinedSchemaTest.java
index 43b2ff4e4..2ebeaaeb3 100644
--- a/core/src/test/java/org/everit/json/schema/CombinedSchemaTest.java
+++ b/core/src/test/java/org/everit/json/schema/CombinedSchemaTest.java
@@ -21,7 +21,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.Arrays;
 import java.util.List;
 
 import static java.util.Arrays.asList;
diff --git a/core/src/test/java/org/everit/json/schema/NumberSchemaTest.java b/core/src/test/java/org/everit/json/schema/NumberSchemaTest.java
index db24fe1c5..e13246c3b 100644
--- a/core/src/test/java/org/everit/json/schema/NumberSchemaTest.java
+++ b/core/src/test/java/org/everit/json/schema/NumberSchemaTest.java
@@ -19,10 +19,8 @@
 import nl.jqno.equalsverifier.Warning;
 import org.everit.json.schema.loader.SchemaLoader;
 import org.json.JSONObject;
-import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 public class NumberSchemaTest {
diff --git a/core/src/test/java/org/everit/json/schema/PointerBubblingTest.java b/core/src/test/java/org/everit/json/schema/PointerBubblingTest.java
index 8636cb308..1dbb983b0 100644
--- a/core/src/test/java/org/everit/json/schema/PointerBubblingTest.java
+++ b/core/src/test/java/org/everit/json/schema/PointerBubblingTest.java
@@ -17,7 +17,6 @@
 
 import org.everit.json.schema.loader.SchemaLoader;
 import org.json.JSONObject;
-import org.json.JSONTokener;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/core/src/test/java/org/everit/json/schema/ValidationExceptionTest.java b/core/src/test/java/org/everit/json/schema/ValidationExceptionTest.java
index 07b6e5e0c..3fee850a3 100644
--- a/core/src/test/java/org/everit/json/schema/ValidationExceptionTest.java
+++ b/core/src/test/java/org/everit/json/schema/ValidationExceptionTest.java
@@ -16,7 +16,6 @@
 package org.everit.json.schema;
 
 import org.json.JSONObject;
-import org.json.JSONTokener;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/core/src/test/java/org/everit/json/schema/internal/JSONPrinterTest.java b/core/src/test/java/org/everit/json/schema/internal/JSONPrinterTest.java
index e517637af..1b0e1e273 100644
--- a/core/src/test/java/org/everit/json/schema/internal/JSONPrinterTest.java
+++ b/core/src/test/java/org/everit/json/schema/internal/JSONPrinterTest.java
@@ -5,7 +5,6 @@
 import org.json.JSONObject;
 import org.json.JSONWriter;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.StringWriter;
diff --git a/core/src/test/java/org/everit/json/schema/loader/CustomFormatValidatorTest.java b/core/src/test/java/org/everit/json/schema/loader/CustomFormatValidatorTest.java
index d0605b916..229debf1c 100644
--- a/core/src/test/java/org/everit/json/schema/loader/CustomFormatValidatorTest.java
+++ b/core/src/test/java/org/everit/json/schema/loader/CustomFormatValidatorTest.java
@@ -19,7 +19,6 @@
 import org.everit.json.schema.ResourceLoader;
 import org.everit.json.schema.ValidationException;
 import org.json.JSONObject;
-import org.json.JSONTokener;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/core/src/test/java/org/everit/json/schema/loader/ResolutionScopeTest.java b/core/src/test/java/org/everit/json/schema/loader/ResolutionScopeTest.java
index 3c5afc526..e97f8cf16 100644
--- a/core/src/test/java/org/everit/json/schema/loader/ResolutionScopeTest.java
+++ b/core/src/test/java/org/everit/json/schema/loader/ResolutionScopeTest.java
@@ -18,7 +18,6 @@
 import org.everit.json.schema.ResourceLoader;
 import org.everit.json.schema.loader.internal.DefaultSchemaClient;
 import org.json.JSONObject;
-import org.json.JSONTokener;
 import org.junit.Test;
 
 import java.io.InputStream;
diff --git a/core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java b/core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java
index b4487979b..0dccd5360 100644
--- a/core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java
+++ b/core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java
@@ -12,7 +12,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Arrays;
-import java.util.Map;
 import java.util.Optional;
 
 import static org.junit.Assert.assertEquals;
diff --git a/tests/src/test/java/org/everit/json/schema/IssueServlet.java b/tests/src/test/java/org/everit/json/schema/IssueServlet.java
index 87c2c4e5f..552e97da7 100644
--- a/tests/src/test/java/org/everit/json/schema/IssueServlet.java
+++ b/tests/src/test/java/org/everit/json/schema/IssueServlet.java
@@ -21,7 +21,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.util.Arrays;
-import java.util.Objects;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/tests/src/test/java/org/everit/json/schema/IssueTest.java b/tests/src/test/java/org/everit/json/schema/IssueTest.java
index c3070ed6a..581691347 100644
--- a/tests/src/test/java/org/everit/json/schema/IssueTest.java
+++ b/tests/src/test/java/org/everit/json/schema/IssueTest.java
@@ -15,7 +15,6 @@
  */
 package org.everit.json.schema;
 
-import org.eclipse.jetty.server.Server;
 import org.everit.json.schema.loader.SchemaLoader;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -54,8 +53,6 @@ public static List<Object[]> params() {
 
     private final File issueDir;
 
-    private Server server;
-
     private ServletSupport servletSupport;
 
     private List<String> validationFailureList;
diff --git a/tests/src/test/java/org/everit/json/schema/RelativeURITest.java b/tests/src/test/java/org/everit/json/schema/RelativeURITest.java
index b4201c862..5b10d64c0 100644
--- a/tests/src/test/java/org/everit/json/schema/RelativeURITest.java
+++ b/tests/src/test/java/org/everit/json/schema/RelativeURITest.java
@@ -15,7 +15,6 @@
  */
 package org.everit.json.schema;
 
-import org.eclipse.jetty.server.Server;
 import org.everit.json.schema.loader.SchemaLoader;
 import org.json.JSONObject;
 import org.json.JSONTokener;
@@ -25,8 +24,6 @@
 
 public class RelativeURITest {
 
-    private Server server;
-
     @Test
     public void test() throws URISyntaxException {
         ServletSupport.withDocumentRoot("/org/everit/json/schema/relative-uri/")
diff --git a/tests/src/test/java/org/everit/json/schema/ServletSupport.java b/tests/src/test/java/org/everit/json/schema/ServletSupport.java
index b66f6fdab..e24445ebd 100644
--- a/tests/src/test/java/org/everit/json/schema/ServletSupport.java
+++ b/tests/src/test/java/org/everit/json/schema/ServletSupport.java
@@ -21,7 +21,6 @@
 
 import java.io.File;
 import java.net.URISyntaxException;
-import java.util.Objects;
 
 import static java.util.Objects.requireNonNull;