diff --git a/json-path/src/main/java/com/jayway/jsonpath/IndefinitePathException.java b/json-path/src/main/java/com/jayway/jsonpath/IndefinitePathException.java
index a63220bd..8858f74b 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/IndefinitePathException.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/IndefinitePathException.java
@@ -6,6 +6,7 @@ package com.jayway.jsonpath;
  * Date: 3/4/12
  * Time: 7:15 PM
  */
+@SuppressWarnings("serial")
 public class IndefinitePathException extends RuntimeException {
 
 
diff --git a/json-path/src/main/java/com/jayway/jsonpath/InvalidJsonException.java b/json-path/src/main/java/com/jayway/jsonpath/InvalidJsonException.java
index a324c377..c70d6fe5 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/InvalidJsonException.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/InvalidJsonException.java
@@ -17,6 +17,7 @@ package com.jayway.jsonpath;
 /**
  * @author Kalle Stenflo
  */
+@SuppressWarnings("serial")
 public class InvalidJsonException extends RuntimeException {
 
     public InvalidJsonException() {
diff --git a/json-path/src/main/java/com/jayway/jsonpath/InvalidModelPathException.java b/json-path/src/main/java/com/jayway/jsonpath/InvalidModelPathException.java
index 5d0714b4..6c68ceb5 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/InvalidModelPathException.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/InvalidModelPathException.java
@@ -6,6 +6,7 @@ package com.jayway.jsonpath;
  * Date: 3/4/12
  * Time: 2:38 PM
  */
+@SuppressWarnings("serial")
 public class InvalidModelPathException extends RuntimeException {
 
     public InvalidModelPathException() {
diff --git a/json-path/src/main/java/com/jayway/jsonpath/InvalidPathException.java b/json-path/src/main/java/com/jayway/jsonpath/InvalidPathException.java
index c28cb8b5..22f87fc5 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/InvalidPathException.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/InvalidPathException.java
@@ -17,6 +17,7 @@ package com.jayway.jsonpath;
 /**
  * @author Kalle Stenflo
  */
+@SuppressWarnings("serial")
 public class InvalidPathException extends RuntimeException {
 
     public InvalidPathException() {
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/PathTokenizer.java b/json-path/src/main/java/com/jayway/jsonpath/internal/PathTokenizer.java
index afaa4330..d08cfbff 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/PathTokenizer.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/PathTokenizer.java
@@ -16,7 +16,6 @@ package com.jayway.jsonpath.internal;
 
 import com.jayway.jsonpath.InvalidPathException;
 
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ArrayEvalFilter.java b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ArrayEvalFilter.java
index b4d1cad1..e951b93b 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ArrayEvalFilter.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ArrayEvalFilter.java
@@ -73,7 +73,7 @@ public class ArrayEvalFilter extends Filter {
         if (!jsonProvider.isMap(check)) {
             return false;
         }
-        Map obj = jsonProvider.toMap(check);
+        Map<String, Object> obj = jsonProvider.toMap(check);
 
         if (!obj.containsKey(conditionStatement.getField())) {
             return false;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/spi/JsonProvider.java b/json-path/src/main/java/com/jayway/jsonpath/spi/JsonProvider.java
index b936c9fa..2c933dfc 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/spi/JsonProvider.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/spi/JsonProvider.java
@@ -18,7 +18,6 @@ import com.jayway.jsonpath.InvalidJsonException;
 
 import java.io.InputStream;
 import java.io.Reader;
-import java.net.URL;
 import java.util.List;
 import java.util.Map;
 
diff --git a/json-path/src/main/java/com/jayway/jsonpath/spi/MappingProvider.java b/json-path/src/main/java/com/jayway/jsonpath/spi/MappingProvider.java
index 3db0c084..e5ab7f0c 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/spi/MappingProvider.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/spi/MappingProvider.java
@@ -1,11 +1,5 @@
 package com.jayway.jsonpath.spi;
 
-import org.codehaus.jackson.map.type.CollectionType;
-import org.codehaus.jackson.map.type.TypeFactory;
-import org.codehaus.jackson.map.type.TypeModifier;
-import org.codehaus.jackson.map.type.TypeParser;
-import org.codehaus.jackson.type.JavaType;
-
 import java.util.Collection;
 
 /**
diff --git a/json-path/src/main/java/com/jayway/jsonpath/spi/impl/JacksonProvider.java b/json-path/src/main/java/com/jayway/jsonpath/spi/impl/JacksonProvider.java
index b238a65d..7eb934b6 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/spi/impl/JacksonProvider.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/spi/impl/JacksonProvider.java
@@ -15,7 +15,6 @@
 package com.jayway.jsonpath.spi.impl;
 
 import com.jayway.jsonpath.InvalidJsonException;
-import com.jayway.jsonpath.spi.JsonProvider;
 import com.jayway.jsonpath.spi.MappingProvider;
 import com.jayway.jsonpath.spi.Mode;
 import org.codehaus.jackson.map.ObjectMapper;
diff --git a/json-path/src/test/java/com/jayway/jsonpath/ComplianceTest.java b/json-path/src/test/java/com/jayway/jsonpath/ComplianceTest.java
index 53ec1ab0..ddea1dbe 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/ComplianceTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/ComplianceTest.java
@@ -7,7 +7,6 @@ import java.util.List;
 import java.util.Map;
 
 import static org.hamcrest.Matchers.*;
-import static org.hamcrest.Matchers.hasItems;
 import static org.junit.Assert.assertThat;
 
 /**
diff --git a/json-path/src/test/java/com/jayway/jsonpath/JsonPathTest.java b/json-path/src/test/java/com/jayway/jsonpath/JsonPathTest.java
index cd29b706..5f6c6786 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/JsonPathTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/JsonPathTest.java
@@ -9,7 +9,6 @@ import java.util.Map;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItems;
 import static org.junit.Assert.*;
-import static org.junit.Assert.assertThat;
 
 /**
  * Created by IntelliJ IDEA.