diff --git a/src/main/java/org/neo4j/gis/spatial/DefaultLayer.java b/src/main/java/org/neo4j/gis/spatial/DefaultLayer.java
index e74636662..9b8f674b1 100644
--- a/src/main/java/org/neo4j/gis/spatial/DefaultLayer.java
+++ b/src/main/java/org/neo4j/gis/spatial/DefaultLayer.java
@@ -34,10 +34,7 @@
 import org.neo4j.graphdb.Direction;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.ReturnableEvaluator;
-import org.neo4j.graphdb.StopEvaluator;
 import org.neo4j.graphdb.Transaction;
-import org.neo4j.graphdb.Traverser.Order;
 import org.opengis.referencing.FactoryException;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 
diff --git a/src/main/java/org/neo4j/gis/spatial/SpatialDatabaseService.java b/src/main/java/org/neo4j/gis/spatial/SpatialDatabaseService.java
index fb4f3a22b..fda29299f 100644
--- a/src/main/java/org/neo4j/gis/spatial/SpatialDatabaseService.java
+++ b/src/main/java/org/neo4j/gis/spatial/SpatialDatabaseService.java
@@ -23,7 +23,6 @@
 import java.util.List;
 
 import org.neo4j.collections.rtree.Listener;
-import org.neo4j.collections.rtree.RTreeRelationshipTypes;
 import org.neo4j.gis.spatial.encoders.Configurable;
 import org.neo4j.gis.spatial.encoders.SimplePointEncoder;
 import org.neo4j.graphdb.Direction;
@@ -31,10 +30,7 @@
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.RelationshipType;
-import org.neo4j.graphdb.ReturnableEvaluator;
-import org.neo4j.graphdb.StopEvaluator;
 import org.neo4j.graphdb.Transaction;
-import org.neo4j.graphdb.Traverser.Order;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 
 import com.vividsolutions.jts.geom.Geometry;
diff --git a/src/test/java/org/neo4j/gis/spatial/IndexProviderTest.java b/src/test/java/org/neo4j/gis/spatial/IndexProviderTest.java
index 02fbe393d..acccdfc24 100644
--- a/src/test/java/org/neo4j/gis/spatial/IndexProviderTest.java
+++ b/src/test/java/org/neo4j/gis/spatial/IndexProviderTest.java
@@ -71,7 +71,6 @@
 import org.neo4j.test.ImpermanentGraphDatabase;
 
 import com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jGraph;
-import org.neo4j.gis.spatial.indexprovider.SpatialRecordHits;
 
 public class IndexProviderTest {