diff --git a/community/collections/src/main/java/org/neo4j/helpers/collection/Iterables.java b/community/collections/src/main/java/org/neo4j/helpers/collection/Iterables.java
index afa9d9dc5412f..be3eeb3c7f9fb 100644
--- a/community/collections/src/main/java/org/neo4j/helpers/collection/Iterables.java
+++ b/community/collections/src/main/java/org/neo4j/helpers/collection/Iterables.java
@@ -54,7 +54,7 @@ private Iterables()
     @SuppressWarnings( "unchecked" )
     public static <T> Iterable<T> empty()
     {
-        return EMPTY;
+        return Collections.emptyList();
     }
 
     public static <T> Iterable<T> limit( final int limitItems, final Iterable<T> iterable )
@@ -186,7 +186,7 @@ public static <X> Iterable<X> skip( final int skip, final Iterable<X> iterable )
                 }
                 else
                 {
-                    return Iterables.<X>empty().iterator();
+                    return Collections.emptyIterator();
                 }
             }
 
@@ -914,33 +914,4 @@ public static <T extends Enum<T>> List<String> enumNames( Class<T> cls )
         EnumSet.allOf( cls ).forEach( item -> names.add( item.name() ) );
         return names;
     }
-
-    private static Iterable EMPTY = new Iterable()
-    {
-        Iterator iterator = new Iterator()
-        {
-            @Override
-            public boolean hasNext()
-            {
-                return false;
-            }
-
-            @Override
-            public Object next()
-            {
-                throw new NoSuchElementException();
-            }
-
-            @Override
-            public void remove()
-            {
-            }
-        };
-
-        @Override
-        public Iterator iterator()
-        {
-            return iterator;
-        }
-    };
 }
diff --git a/community/collections/src/main/java/org/neo4j/helpers/collection/Iterators.java b/community/collections/src/main/java/org/neo4j/helpers/collection/Iterators.java
index 75316edf07d29..6081d06927223 100644
--- a/community/collections/src/main/java/org/neo4j/helpers/collection/Iterators.java
+++ b/community/collections/src/main/java/org/neo4j/helpers/collection/Iterators.java
@@ -23,7 +23,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Deque;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -45,12 +44,17 @@
 import org.neo4j.graphdb.ResourceIterable;
 import org.neo4j.graphdb.ResourceIterator;
 
+import static java.util.Collections.emptyIterator;
+
 /**
  * Contains common functionality regarding {@link Iterator}s and
  * {@link Iterable}s.
  */
 public abstract class Iterators
 {
+    private static final ResourceIterator EMPTY_RESOURCE_ITERATOR =
+            resourceIterator( emptyIterator(), Resource.EMPTY );
+
     /**
      * Returns the given iterator's first element or {@code null} if no
      * element found.
@@ -421,11 +425,6 @@ public static <T> Set<T> asSet( T... items )
         return new HashSet<>( Arrays.asList( items ) );
     }
 
-    public static <T> Set<T> emptySetOf( @SuppressWarnings( "unused"/*just used as a type marker*/ ) Class<T> type )
-    {
-        return Collections.emptySet();
-    }
-
     /**
      * Alias for asSet()
      *
@@ -588,9 +587,9 @@ public static <T> Iterator<T> iterator( int maxItems, T ... items )
     }
 
     @SuppressWarnings( "unchecked" )
-    public static <T> ResourceIterator<T> emptyIterator()
+    public static <T> ResourceIterator<T> emptyResourceIterator()
     {
-        return EMPTY_ITERATOR;
+        return EMPTY_RESOURCE_ITERATOR;
     }
 
     public static <T> boolean contains( Iterator<T> iterator, T item )
@@ -648,34 +647,6 @@ public static <T> T[] array( T... items )
         return items;
     }
 
-    @SuppressWarnings( "rawtypes" )
-    private static final ResourceIterator EMPTY_ITERATOR = new ResourceIterator()
-    {
-        @Override
-        public boolean hasNext()
-        {
-            return false;
-        }
-
-        @Override
-        public Object next()
-        {
-            throw new NoSuchElementException();
-        }
-
-        @Override
-        public void remove()
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void close()
-        {
-            // do nothing
-        }
-    };
-
     public static <X> Iterator<X> filter( Predicate<? super X> specification, Iterator<X> i )
     {
         return new FilterIterable.FilterIterator<>( i, specification );
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexAccessor.java
index ba864df950aad..6449dc9fece14 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexAccessor.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexAccessor.java
@@ -31,7 +31,8 @@
 import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater;
 import org.neo4j.storageengine.api.schema.IndexReader;
 
-import static org.neo4j.helpers.collection.Iterators.emptyIterator;
+import static java.util.Collections.emptyIterator;
+import static org.neo4j.helpers.collection.Iterators.emptyResourceIterator;
 
 /**
  * Used for online operation of an index.
@@ -163,7 +164,7 @@ public Iterator<Long> iterator()
         @Override
         public ResourceIterator<File> snapshotFiles()
         {
-            return emptyIterator();
+            return emptyResourceIterator();
         }
 
         @Override
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexProvider.java
index 27dbf42499586..4b4d54f3e6037 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexProvider.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexProvider.java
@@ -229,7 +229,7 @@ public abstract StoreMigrationParticipant storeMigrationParticipant( FileSystemA
      */
     public ResourceIterator<File> snapshotMetaFiles()
     {
-        return Iterators.emptyIterator();
+        return Iterators.emptyResourceIterator();
     }
 
     public static class Descriptor
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedIndexProxy.java
index 7bfad61558157..04298befd4ebf 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedIndexProxy.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedIndexProxy.java
@@ -33,7 +33,7 @@
 import org.neo4j.logging.LogProvider;
 
 import static org.neo4j.helpers.FutureAdapter.VOID;
-import static org.neo4j.helpers.collection.Iterators.emptyIterator;
+import static org.neo4j.helpers.collection.Iterators.emptyResourceIterator;
 
 public class FailedIndexProxy extends AbstractSwallowingIndexProxy
 {
@@ -95,6 +95,6 @@ public void validate() throws IndexPopulationFailedKernelException
     @Override
     public ResourceIterator<File> snapshotFiles()
     {
-        return emptyIterator();
+        return emptyResourceIterator();
     }
 }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java
index cb401cead1db4..0ec437e8a7a77 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java
@@ -38,7 +38,7 @@
 import org.neo4j.storageengine.api.schema.IndexReader;
 import org.neo4j.storageengine.api.schema.PopulationProgress;
 
-import static org.neo4j.helpers.collection.Iterators.emptyIterator;
+import static org.neo4j.helpers.collection.Iterators.emptyResourceIterator;
 
 public class PopulatingIndexProxy implements IndexProxy
 {
@@ -157,7 +157,7 @@ public void validate()
     @Override
     public ResourceIterator<File> snapshotFiles()
     {
-        return emptyIterator();
+        return emptyResourceIterator();
     }
 
     @Override
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/PropertyContainerStateImpl.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/PropertyContainerStateImpl.java
index ce500674da564..5655d8a1da530 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/PropertyContainerStateImpl.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/PropertyContainerStateImpl.java
@@ -22,7 +22,6 @@
 import java.util.Iterator;
 import java.util.function.Predicate;
 
-import org.neo4j.graphdb.ResourceIterator;
 import org.neo4j.helpers.collection.CombiningIterator;
 import org.neo4j.helpers.collection.FilteringIterator;
 import org.neo4j.helpers.collection.Iterators;
@@ -32,12 +31,11 @@
 import org.neo4j.storageengine.api.StorageProperty;
 import org.neo4j.storageengine.api.txstate.PropertyContainerState;
 
-import static org.neo4j.helpers.collection.Iterators.emptyIterator;
+import static java.util.Collections.emptyIterator;
 
 public class PropertyContainerStateImpl implements PropertyContainerState
 {
     private final long id;
-    private static final ResourceIterator<StorageProperty> NO_PROPERTIES = emptyIterator();
 
     private VersionedHashMap<Integer, StorageProperty> addedProperties;
     private VersionedHashMap<Integer, StorageProperty> changedProperties;
@@ -145,20 +143,20 @@ public void removeProperty( DefinedProperty property )
     @Override
     public Iterator<StorageProperty> addedProperties()
     {
-        return addedProperties != null ? addedProperties.values().iterator() : NO_PROPERTIES;
+        return addedProperties != null ? addedProperties.values().iterator() : emptyIterator();
     }
 
     @Override
     public Iterator<StorageProperty> changedProperties()
     {
-        return changedProperties != null ? changedProperties.values().iterator() : NO_PROPERTIES;
+        return changedProperties != null ? changedProperties.values().iterator() : emptyIterator();
     }
 
     @Override
     public Iterator<Integer> removedProperties()
     {
         return removedProperties != null ? removedProperties.keySet().iterator()
-                : Iterators.<Integer>emptyIterator();
+                : emptyIterator();
     }
 
     @Override
@@ -181,7 +179,7 @@ public Iterator<StorageProperty> addedAndChangedProperties()
                 out = changedProperties.values().iterator();
             }
         }
-        return out != null ? out : NO_PROPERTIES;
+        return out != null ? out : emptyIterator();
     }
 
     @Override
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java
index 5ba8110d04bd2..d73b38670a62c 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java
@@ -42,6 +42,8 @@
 import org.neo4j.kernel.impl.store.record.IndexRule;
 import org.neo4j.storageengine.api.schema.SchemaRule;
 
+import static java.util.Collections.emptyIterator;
+
 /**
  * A cache of {@link SchemaRule schema rules} as well as enforcement of schema consistency.
  * Will always reflect the committed state of the schema store.
@@ -237,12 +239,12 @@ public IndexDescriptor indexDescriptor( LabelSchemaDescriptor descriptor )
     public Iterator<IndexDescriptor> indexDescriptorsForLabel( int labelId )
     {
         Set<IndexDescriptor> forLabel = indexDescriptorsByLabel.get( labelId );
-        return forLabel == null ? Iterators.emptyIterator() : forLabel.iterator();
+        return forLabel == null ? emptyIterator() : forLabel.iterator();
     }
 
     public Iterator<IndexDescriptor> indexesByProperty( int propertyId )
     {
         List<IndexDescriptor> indexes = indexByProperty.get( propertyId );
-        return (indexes == null) ? Iterators.emptyIterator() : indexes.iterator();
+        return (indexes == null) ? emptyIterator() : indexes.iterator();
     }
 }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java
index 4805aaf168e21..8349f48efaa78 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java
@@ -108,7 +108,7 @@
 
 import static java.lang.String.format;
 import static org.neo4j.collection.primitive.PrimitiveLongCollections.map;
-import static org.neo4j.helpers.collection.Iterators.emptyIterator;
+import static org.neo4j.helpers.collection.Iterators.emptyResourceIterator;
 import static org.neo4j.kernel.api.security.SecurityContext.AUTH_DISABLED;
 import static org.neo4j.kernel.impl.api.legacyindex.InternalAutoIndexing.NODE_AUTO_INDEX;
 import static org.neo4j.kernel.impl.api.legacyindex.InternalAutoIndexing.RELATIONSHIP_AUTO_INDEX;
@@ -593,7 +593,7 @@ private ResourceIterator<Node> nodesByLabelAndProperty( Label myLabel, String ke
         if ( propertyId == NO_SUCH_PROPERTY_KEY || labelId == NO_SUCH_LABEL )
         {
             statement.close();
-            return emptyIterator();
+            return emptyResourceIterator();
         }
 
         IndexDescriptor descriptor = findAnyIndexByLabelAndProperty( readOps, propertyId, labelId );
@@ -652,7 +652,7 @@ private ResourceIterator<Node> allNodesWithLabel( final Label myLabel )
         if ( labelId == KeyReadOperations.NO_SUCH_LABEL )
         {
             statement.close();
-            return emptyIterator();
+            return emptyResourceIterator();
         }
 
         final PrimitiveLongIterator nodeIds = statement.readOperations().nodesGetForLabel( labelId );
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/StoreViewNodeStoreScan.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/StoreViewNodeStoreScan.java
index 3dcf124554f82..4f0689765224b 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/StoreViewNodeStoreScan.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/StoreViewNodeStoreScan.java
@@ -26,13 +26,12 @@
 import java.util.function.IntPredicate;
 
 import org.neo4j.collection.primitive.PrimitiveLongResourceIterator;
-import org.neo4j.helpers.collection.Iterators;
 import org.neo4j.helpers.collection.PrefetchingIterator;
 import org.neo4j.helpers.collection.Visitor;
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
-import org.neo4j.kernel.impl.api.index.NodeUpdates;
 import org.neo4j.kernel.api.labelscan.NodeLabelUpdate;
 import org.neo4j.kernel.impl.api.index.MultipleIndexPopulator;
+import org.neo4j.kernel.impl.api.index.NodeUpdates;
 import org.neo4j.kernel.impl.locking.LockService;
 import org.neo4j.kernel.impl.store.NodeStore;
 import org.neo4j.kernel.impl.store.PropertyStore;
@@ -42,6 +41,7 @@
 import org.neo4j.kernel.impl.store.record.Record;
 import org.neo4j.kernel.impl.util.Validators;
 
+import static java.util.Collections.emptyIterator;
 import static org.neo4j.collection.primitive.PrimitiveLongCollections.EMPTY_LONG_ARRAY;
 import static org.neo4j.kernel.api.labelscan.NodeLabelUpdate.labelChanges;
 import static org.neo4j.kernel.impl.store.NodeLabelsField.parseLabelsField;
@@ -161,14 +161,14 @@ public void configure( Collection<MultipleIndexPopulator.IndexPopulation> popula
     private class PropertyBlockIterator extends PrefetchingIterator<PropertyBlock>
     {
         private final Iterator<PropertyRecord> records;
-        private Iterator<PropertyBlock> blocks = Iterators.emptyIterator();
+        private Iterator<PropertyBlock> blocks = emptyIterator();
 
         PropertyBlockIterator( NodeRecord node )
         {
             long firstPropertyId = node.getNextProp();
             if ( firstPropertyId == Record.NO_NEXT_PROPERTY.intValue() )
             {
-                records = Iterators.emptyIterator();
+                records = emptyIterator();
             }
             else
             {
diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/PropertyContainerState.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/PropertyContainerState.java
index 493b3bf648c39..5c1358e7e70be 100644
--- a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/PropertyContainerState.java
+++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/PropertyContainerState.java
@@ -21,10 +21,11 @@
 
 import java.util.Iterator;
 
-import org.neo4j.helpers.collection.Iterators;
 import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationException;
 import org.neo4j.storageengine.api.StorageProperty;
 
+import static java.util.Collections.emptyIterator;
+
 /**
  * Represents the property changes to a {@link NodeState node} or {@link RelationshipState relationship}:
  * <ul>
@@ -69,25 +70,25 @@ class EmptyPropertyContainerState implements PropertyContainerState
         @Override
         public Iterator<StorageProperty> addedProperties()
         {
-            return Iterators.emptyIterator();
+            return emptyIterator();
         }
 
         @Override
         public Iterator<StorageProperty> changedProperties()
         {
-            return Iterators.emptyIterator();
+            return emptyIterator();
         }
 
         @Override
         public Iterator<Integer> removedProperties()
         {
-            return Iterators.emptyIterator();
+            return emptyIterator();
         }
 
         @Override
         public Iterator<StorageProperty> addedAndChangedProperties()
         {
-            return Iterators.emptyIterator();
+            return emptyIterator();
         }
 
         @Override
diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java
index f97df8de23c5e..3c4a39e83e45c 100644
--- a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java
+++ b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java
@@ -47,7 +47,6 @@
 import org.neo4j.graphdb.schema.IndexDefinition;
 import org.neo4j.helpers.collection.Iterables;
 import org.neo4j.helpers.collection.IteratorWrapper;
-import org.neo4j.helpers.collection.Iterators;
 import org.neo4j.helpers.collection.Visitor;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.pagecache.IOLimiter;
@@ -163,6 +162,7 @@
 import org.neo4j.unsafe.batchinsert.DirectRecordAccessSet;
 
 import static java.lang.Boolean.parseBoolean;
+import static java.util.Collections.emptyIterator;
 import static org.neo4j.collection.primitive.PrimitiveLongCollections.map;
 import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.kernel.impl.store.NodeLabelsField.parseLabelsField;
@@ -729,7 +729,7 @@ private Iterator<PropertyBlock> propertiesIterator( Map<String, Object> properti
     {
         if ( properties == null || properties.isEmpty() )
         {
-            return Iterators.emptyIterator();
+            return emptyIterator();
         }
         return new IteratorWrapper<PropertyBlock, Map.Entry<String,Object>>( properties.entrySet().iterator() )
         {
diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/LabelScanStoreUpdateIT.java b/community/kernel/src/test/java/org/neo4j/graphdb/LabelScanStoreUpdateIT.java
index b94138b0554e1..9c45a8d3e415f 100644
--- a/community/kernel/src/test/java/org/neo4j/graphdb/LabelScanStoreUpdateIT.java
+++ b/community/kernel/src/test/java/org/neo4j/graphdb/LabelScanStoreUpdateIT.java
@@ -31,12 +31,12 @@
 import org.neo4j.helpers.collection.Iterables;
 import org.neo4j.helpers.collection.Iterators;
 
+import static java.util.Collections.emptySet;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.helpers.collection.Iterators.asSet;
-import static org.neo4j.helpers.collection.Iterators.emptySetOf;
 import static org.neo4j.helpers.collection.Iterators.single;
 
 public abstract class LabelScanStoreUpdateIT
@@ -118,8 +118,7 @@ public void shouldGetNodesAfterDeletedNodes() throws Exception
         assertEquals(
                 asSet( node2 ),
                 getAllNodesWithLabel( First ) );
-        assertEquals(
-                emptySetOf( Node.class ),
+        assertEquals( emptySet(),
                 getAllNodesWithLabel( Second ) );
         assertEquals(
                 asSet( node2 ),
@@ -144,8 +143,7 @@ public void shouldGetNodesAfterRemovedLabels() throws Exception
         assertEquals(
                 asSet( node1 ),
                 getAllNodesWithLabel( Second ) );
-        assertEquals(
-                emptySetOf( Node.class ),
+        assertEquals( emptySet(),
                 getAllNodesWithLabel( Third ) );
     }
 
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java
index 0a37f84491b06..56483521b0f5c 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java
@@ -43,6 +43,7 @@
 import org.neo4j.kernel.impl.api.integrationtest.KernelIntegrationTest;
 import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator;
 
+import static java.util.Collections.emptySet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertEquals;
@@ -50,7 +51,6 @@
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.neo4j.helpers.collection.Iterators.asSet;
-import static org.neo4j.helpers.collection.Iterators.emptySetOf;
 
 public class IndexIT extends KernelIntegrationTest
 {
@@ -124,7 +124,7 @@ public void rollBackIndexRuleShouldNotBeCommitted() throws Exception
 
         // THEN
         ReadOperations readOperations = readOperationsInNewTransaction();
-        assertEquals( emptySetOf( IndexDescriptor.class ), asSet( readOperations.indexesGetForLabel( labelId ) ) );
+        assertEquals( emptySet(), asSet( readOperations.indexesGetForLabel( labelId ) ) );
         commit();
     }
 
@@ -142,7 +142,7 @@ public void shouldRemoveAConstraintIndexWithoutOwnerInRecovery() throws Exceptio
 
         // then
         ReadOperations readOperations = readOperationsInNewTransaction();
-        assertEquals( emptySetOf( IndexDescriptor.class ), asSet( readOperations.indexesGetForLabel( labelId ) ) );
+        assertEquals( emptySet(), asSet( readOperations.indexesGetForLabel( labelId ) ) );
         commit();
     }
 
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java
index fe84a746b394e..823568459c11f 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java
@@ -33,7 +33,7 @@
 import org.neo4j.storageengine.api.schema.PopulationProgress;
 
 import static org.neo4j.helpers.FutureAdapter.VOID;
-import static org.neo4j.helpers.collection.Iterators.emptyIterator;
+import static org.neo4j.helpers.collection.Iterators.emptyResourceIterator;
 
 public class IndexProxyAdapter implements IndexProxy
 {
@@ -114,7 +114,7 @@ public void validate()
     @Override
     public ResourceIterator<File> snapshotFiles()
     {
-        return emptyIterator();
+        return emptyResourceIterator();
     }
 
     @Override
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java
index 02aa9dda8f607..4b591174af3ef 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java
@@ -1142,7 +1142,7 @@ private IndexingService newIndexingServiceWithMockedDependencies( IndexPopulator
         when( indexProvider.getOnlineAccessor( anyLong(), any( IndexDescriptor.class ),
                 any( IndexSamplingConfig.class ) ) )
                 .thenReturn( accessor );
-        when( indexProvider.snapshotMetaFiles() ).thenReturn( Iterators.emptyIterator() );
+        when( indexProvider.snapshotMetaFiles() ).thenReturn( Iterators.emptyResourceIterator() );
         when( indexProvider.storeMigrationParticipant( any( FileSystemAbstraction.class ), any( PageCache.class ),
                 any( LabelScanStoreProvider.class ) ) )
                 .thenReturn( StoreMigrationParticipant.NOT_PARTICIPATING );
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndex.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndex.java
index af85e146a481c..324d70583d778 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndex.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndex.java
@@ -40,7 +40,7 @@
 import org.neo4j.storageengine.api.schema.IndexReader;
 import org.neo4j.storageengine.api.schema.IndexSample;
 
-import static org.neo4j.helpers.collection.Iterators.emptyIterator;
+import static org.neo4j.helpers.collection.Iterators.emptyResourceIterator;
 
 class InMemoryIndex
 {
@@ -249,7 +249,7 @@ public BoundedIterable<Long> newAllEntriesReader()
         @Override
         public ResourceIterator<File> snapshotFiles()
         {
-            return emptyIterator();
+            return emptyResourceIterator();
         }
 
         @Override
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIT.java
index ca989e3b4eedf..bc9b7bb21a1ae 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIT.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIT.java
@@ -52,6 +52,7 @@
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.storageengine.api.NodeItem;
 
+import static java.util.Collections.emptySet;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
@@ -63,7 +64,6 @@
 import static org.junit.Assume.assumeThat;
 import static org.neo4j.collection.primitive.PrimitiveIntCollections.asSet;
 import static org.neo4j.graphdb.Label.label;
-import static org.neo4j.helpers.collection.Iterators.emptySetOf;
 import static org.neo4j.kernel.api.security.SecurityContext.AUTH_DISABLED;
 
 public class KernelIT extends KernelIntegrationTest
@@ -433,7 +433,7 @@ public void deletingNodeWithLabelsShouldHaveThoseLabelRemovalsReflectedInTransac
         tx.success();
         tx.close();
 
-        assertEquals( emptySetOf( Long.class ), nodes );
+        assertEquals( emptySet(), nodes );
     }
 
     @Test
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/SchemaTransactionStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/SchemaTransactionStateTest.java
index b7df3fa7053c8..18fd1ff3ee314 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/SchemaTransactionStateTest.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/SchemaTransactionStateTest.java
@@ -39,11 +39,12 @@
 import org.neo4j.kernel.impl.api.StateHandlingStatementOperations;
 import org.neo4j.kernel.impl.api.StatementOperationsTestHelper;
 import org.neo4j.kernel.impl.api.legacyindex.InternalAutoIndexing;
-import org.neo4j.kernel.impl.api.store.SingleNodeFetch;
 import org.neo4j.kernel.impl.api.store.StoreSchemaResources;
 import org.neo4j.kernel.impl.index.LegacyIndexStore;
 import org.neo4j.storageengine.api.StoreReadLayer;
 
+import static java.util.Collections.emptyIterator;
+import static java.util.Collections.emptySet;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.mock;
@@ -52,8 +53,6 @@
 import static org.mockito.Mockito.when;
 import static org.neo4j.helpers.collection.Iterables.option;
 import static org.neo4j.helpers.collection.Iterators.asSet;
-import static org.neo4j.helpers.collection.Iterators.emptyIterator;
-import static org.neo4j.helpers.collection.Iterators.emptySetOf;
 import static org.neo4j.kernel.impl.api.state.StubCursors.asNodeCursor;
 import static org.neo4j.storageengine.api.txstate.ReadableTransactionState.EMPTY;
 
@@ -219,7 +218,7 @@ public void shouldNotReturnExistentRuleDroppedInTransaction() throws Exception
         Iterator<IndexDescriptor> rulesByLabel = txContext.indexesGetForLabel( state, labelId1 );
 
         // THEN
-        assertEquals( emptySetOf( IndexDescriptor.class ), asSet( rulesByLabel ) );
+        assertEquals( emptySet(), asSet( rulesByLabel ) );
     }
 
     // exists
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java
index b73416f56ad24..79624ad2aae1f 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java
@@ -28,7 +28,6 @@
 import org.neo4j.collection.primitive.PrimitiveLongIterator;
 import org.neo4j.cursor.Cursor;
 import org.neo4j.helpers.collection.Iterables;
-import org.neo4j.helpers.collection.Iterators;
 import org.neo4j.kernel.api.DataWriteOperations;
 import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException;
 import org.neo4j.kernel.api.legacyindex.AutoIndexOperations;
@@ -61,6 +60,7 @@
 import org.neo4j.storageengine.api.txstate.ReadableTransactionState;
 import org.neo4j.storageengine.api.txstate.WritableTransactionState;
 
+import static java.util.Collections.emptyIterator;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
@@ -141,7 +141,7 @@ public void shouldGetConstraintsByLabelAndProperty() throws Exception
         TransactionState txState = new TxState();
         KernelStatement state = mockedState( txState );
         when( inner.constraintsGetForSchema( constraint.schema() ) )
-                .thenAnswer( invocation -> Iterators.emptyIterator() );
+                .thenAnswer( invocation -> emptyIterator() );
         StateHandlingStatementOperations context = newTxStateOps( inner );
         context.uniquePropertyConstraintCreate( state, descriptor );
 
@@ -163,11 +163,11 @@ public void shouldGetConstraintsByLabel() throws Exception
         TransactionState txState = new TxState();
         KernelStatement state = mockedState( txState );
         when( inner.constraintsGetForSchema( constraint1.schema() ) )
-                .thenAnswer( invocation -> Iterators.emptyIterator() );
+                .thenAnswer( invocation -> emptyIterator() );
         when( inner.constraintsGetForSchema( constraint2.schema() ) )
-                .thenAnswer( invocation -> Iterators.emptyIterator() );
+                .thenAnswer( invocation -> emptyIterator() );
         when( inner.constraintsGetForLabel( 1 ) )
-                .thenAnswer( invocation -> Iterators.emptyIterator() );
+                .thenAnswer( invocation -> emptyIterator() );
         when( inner.constraintsGetForLabel( 2 ) )
                 .thenAnswer( invocation -> iterator( constraint1 ) );
         StateHandlingStatementOperations context = newTxStateOps( inner );
@@ -191,9 +191,9 @@ public void shouldGetAllConstraints() throws Exception
         TransactionState txState = new TxState();
         KernelStatement state = mockedState( txState );
         when( inner.constraintsGetForSchema( constraint1.schema() ) )
-                .thenAnswer( invocation -> Iterators.emptyIterator() );
+                .thenAnswer( invocation -> emptyIterator() );
         when( inner.constraintsGetForSchema( constraint2.schema() ) )
-                .thenAnswer( invocation -> Iterators.emptyIterator() );
+                .thenAnswer( invocation -> emptyIterator() );
         when( inner.constraintsGetAll() )
                 .thenAnswer( invocation -> iterator( constraint2 ) );
         StateHandlingStatementOperations context = newTxStateOps( inner );
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/DummyIndexImplementation.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/DummyIndexImplementation.java
index 207a9ed57fcdb..75c6bc1ebb885 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/DummyIndexImplementation.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/DummyIndexImplementation.java
@@ -234,6 +234,6 @@ public void force()
     @Override
     public ResourceIterator<File> listStoreFiles()
     {
-        return Iterators.emptyIterator();
+        return Iterators.emptyResourceIterator();
     }
 }
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreViewTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreViewTest.java
index 822eb4c06e4d8..f72ab2383a30c 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreViewTest.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreViewTest.java
@@ -57,6 +57,7 @@
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.test.rule.EmbeddedDatabaseRule;
 
+import static java.util.Collections.emptySet;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertEquals;
@@ -65,7 +66,6 @@
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 import static org.neo4j.helpers.collection.Iterators.asSet;
-import static org.neo4j.helpers.collection.Iterators.emptySetOf;
 
 public class NeoStoreIndexStoreViewTest
 {
@@ -141,7 +141,7 @@ public void shouldIgnoreDeletedNodesDuringScan() throws Exception
         storeScan.run();
 
         // then
-        assertEquals( emptySetOf( NodeUpdates.class ), visitor.getUpdates() );
+        assertEquals( emptySet(), visitor.getUpdates() );
     }
 
     @Test
diff --git a/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java
index 52af604711a88..9dd366c9164e6 100644
--- a/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java
+++ b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java
@@ -45,10 +45,10 @@
 import org.neo4j.helpers.collection.Iterables;
 
 import static java.lang.String.format;
+import static java.util.Collections.emptySet;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.neo4j.helpers.collection.Iterables.map;
 import static org.neo4j.helpers.collection.Iterators.asSet;
-import static org.neo4j.helpers.collection.Iterators.emptySetOf;
 import static org.neo4j.helpers.collection.Iterators.loop;
 
 public class Neo4jMatchers
@@ -140,7 +140,7 @@ public static TypeSafeDiagnosingMatcher<Node> hasLabels( Label... expectedLabels
 
     public static TypeSafeDiagnosingMatcher<Node> hasNoLabels()
     {
-        return hasLabels( emptySetOf( String.class ) );
+        return hasLabels( emptySet() );
     }
 
     public static TypeSafeDiagnosingMatcher<Node> hasLabels( final Set<String> expectedLabels )
diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/backup/LuceneIndexSnapshots.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/backup/LuceneIndexSnapshots.java
index fb33033846784..602a1dd8377fe 100644
--- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/backup/LuceneIndexSnapshots.java
+++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/backup/LuceneIndexSnapshots.java
@@ -34,7 +34,7 @@
 import org.neo4j.graphdb.ResourceIterator;
 import org.neo4j.helpers.collection.Iterables;
 
-import static org.neo4j.helpers.collection.Iterators.emptyIterator;
+import static org.neo4j.helpers.collection.Iterators.emptyResourceIterator;
 
 /**
  * Create iterators over Lucene index files for a particular {@link IndexCommit index commit}.
@@ -61,7 +61,7 @@ public static ResourceIterator<File> forIndex( File indexFolder, IndexWriter ind
             SnapshotDeletionPolicy policy = (SnapshotDeletionPolicy) deletionPolicy;
             return hasCommits( indexWriter )
                    ? new WritableIndexSnapshotFileIterator( indexFolder, policy )
-                   : emptyIterator();
+                   : emptyResourceIterator();
         }
         else
         {
@@ -83,7 +83,7 @@ public static ResourceIterator<File> forIndex( File indexFolder, Directory direc
     {
         if ( !hasCommits( directory ) )
         {
-            return emptyIterator();
+            return emptyResourceIterator();
         }
         Collection<IndexCommit> indexCommits = DirectoryReader.listCommits( directory );
         IndexCommit indexCommit = Iterables.last( indexCommits );
diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseCompositeIndexAccessorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseCompositeIndexAccessorTest.java
index fd63d8368042b..aaade4f2b9f30 100644
--- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseCompositeIndexAccessorTest.java
+++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseCompositeIndexAccessorTest.java
@@ -53,11 +53,11 @@
 import org.neo4j.test.rule.fs.EphemeralFileSystemRule;
 
 import static java.util.Arrays.asList;
+import static java.util.Collections.emptySet;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import static org.neo4j.helpers.collection.Iterators.asSet;
-import static org.neo4j.helpers.collection.Iterators.emptySetOf;
 import static org.neo4j.test.rule.concurrent.ThreadingRule.waitingWhileIn;
 
 @RunWith( Parameterized.class )
@@ -204,7 +204,7 @@ public void canChangeExistingData() throws Exception
         // THEN
         assertEquals( asSet( nodeId ), PrimitiveLongCollections.toSet( reader
                 .query( IndexQuery.exact( PROP_ID1, values2[0] ), IndexQuery.exact( PROP_ID2, values2[1] ) ) ) );
-        assertEquals( emptySetOf( Long.class ), PrimitiveLongCollections.toSet( reader
+        assertEquals( emptySet(), PrimitiveLongCollections.toSet( reader
                 .query( IndexQuery.exact( PROP_ID1, values[0] ), IndexQuery.exact( PROP_ID2, values[1] ) ) ) );
         reader.close();
     }
diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseIndexAccessorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseIndexAccessorTest.java
index 234fd843f252d..b285c89186a00 100644
--- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseIndexAccessorTest.java
+++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DatabaseIndexAccessorTest.java
@@ -53,12 +53,12 @@
 import org.neo4j.test.rule.fs.EphemeralFileSystemRule;
 
 import static java.util.Arrays.asList;
+import static java.util.Collections.emptySet;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import static org.neo4j.helpers.collection.Iterators.asSet;
-import static org.neo4j.helpers.collection.Iterators.emptySetOf;
 import static org.neo4j.kernel.api.schema.IndexQuery.exact;
 import static org.neo4j.kernel.api.schema.IndexQuery.range;
 import static org.neo4j.test.rule.concurrent.ThreadingRule.waitingWhileIn;
@@ -276,7 +276,7 @@ public void canChangeExistingData() throws Exception
 
         // THEN
         assertEquals( asSet( nodeId ), PrimitiveLongCollections.toSet( reader.query( exact( PROP_ID, value2 ) ) ) );
-        assertEquals( emptySetOf( Long.class ),
+        assertEquals( emptySet(),
                 PrimitiveLongCollections.toSet( reader.query( exact( PROP_ID, value ) ) ) );
         reader.close();
     }
diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java
index 1eed9c8157ffb..75c7830e25dc7 100644
--- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java
+++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java
@@ -47,13 +47,13 @@
 import org.neo4j.test.rule.TestDirectory;
 import org.neo4j.test.rule.fs.DefaultFileSystemRule;
 
+import static java.util.Collections.emptySet;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.neo4j.helpers.collection.Iterators.asList;
-import static org.neo4j.helpers.collection.Iterators.emptySetOf;
 
 public class LuceneSchemaIndexIT
 {
@@ -116,7 +116,7 @@ public void snapshotForIndexWithNoCommits() throws Exception
             // When & Then
             try ( ResourceIterator<File> snapshotIterator = indexAccessor.snapshotFiles() )
             {
-                assertThat( asUniqueSetOfNames( snapshotIterator ), equalTo( emptySetOf( String.class ) ) );
+                assertThat( asUniqueSetOfNames( snapshotIterator ), equalTo( emptySet() ) );
             }
         }
     }
diff --git a/community/server/src/main/java/org/neo4j/server/rest/transactional/StatementDeserializer.java b/community/server/src/main/java/org/neo4j/server/rest/transactional/StatementDeserializer.java
index fc843f896182d..9072c473bd92b 100644
--- a/community/server/src/main/java/org/neo4j/server/rest/transactional/StatementDeserializer.java
+++ b/community/server/src/main/java/org/neo4j/server/rest/transactional/StatementDeserializer.java
@@ -39,20 +39,19 @@
 import org.neo4j.server.rest.transactional.error.Neo4jError;
 
 import static java.util.Arrays.asList;
+import static java.util.Collections.emptyIterator;
 import static java.util.Collections.unmodifiableMap;
 import static org.codehaus.jackson.JsonToken.END_ARRAY;
 import static org.codehaus.jackson.JsonToken.END_OBJECT;
 import static org.codehaus.jackson.JsonToken.FIELD_NAME;
 import static org.codehaus.jackson.JsonToken.START_ARRAY;
 import static org.codehaus.jackson.JsonToken.START_OBJECT;
-import static org.neo4j.helpers.collection.Iterators.emptyIterator;
 import static org.neo4j.helpers.collection.MapUtil.map;
 
 public class StatementDeserializer extends PrefetchingIterator<Statement>
 {
     private static final JsonFactory JSON_FACTORY = new JsonFactory().setCodec( new Neo4jJsonCodec() ).disable( JsonGenerator.Feature.FLUSH_PASSED_TO_STREAM );
     private static final Map<String, Object> NO_PARAMETERS = unmodifiableMap( map() );
-    private static final Iterator<Neo4jError> NO_ERRORS = emptyIterator();
 
     private final JsonParser input;
     private State state;
@@ -80,7 +79,7 @@ public StatementDeserializer( InputStream input )
 
     public Iterator<Neo4jError> errors()
     {
-        return errors == null ? NO_ERRORS : errors.iterator();
+        return errors == null ? emptyIterator() : errors.iterator();
     }
 
     @Override
diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/StubStatementDeserializer.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/StubStatementDeserializer.java
index 77a2e2ce2e0b6..cf11ac1e3957b 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/transactional/StubStatementDeserializer.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/StubStatementDeserializer.java
@@ -23,9 +23,9 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.neo4j.helpers.collection.Iterators;
 import org.neo4j.server.rest.transactional.error.Neo4jError;
 
+import static java.util.Collections.emptyIterator;
 import static org.neo4j.helpers.collection.Iterators.iterator;
 
 public class StubStatementDeserializer extends StatementDeserializer
@@ -38,7 +38,7 @@ public class StubStatementDeserializer extends StatementDeserializer
 
     public static StubStatementDeserializer statements( Statement... statements )
     {
-        return new StubStatementDeserializer( Iterators.<Neo4jError>emptyIterator(), iterator( statements ) );
+        return new StubStatementDeserializer( emptyIterator(), iterator( statements ) );
     }
 
     public StubStatementDeserializer( Iterator<Neo4jError> errors, Iterator<Statement> statements )
diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/correctness/Prover.java b/enterprise/ha/src/test/java/org/neo4j/ha/correctness/Prover.java
index 6fa06b035e8e4..bf5f5de44d0ed 100644
--- a/enterprise/ha/src/test/java/org/neo4j/ha/correctness/Prover.java
+++ b/enterprise/ha/src/test/java/org/neo4j/ha/correctness/Prover.java
@@ -34,8 +34,8 @@
 import org.neo4j.logging.NullLogProvider;
 
 import static java.util.Arrays.asList;
+import static java.util.Collections.emptySet;
 import static org.neo4j.ha.correctness.ClusterInstance.newClusterInstance;
-import static org.neo4j.helpers.collection.Iterators.emptySetOf;
 
 public class Prover
 {
@@ -86,7 +86,7 @@ private void bootstrapCluster() throws Exception
                                 10, NullLogProvider.getInstance() ),
                         newClusterInstance( new InstanceId( 3 ), new URI( instance3 ), new Monitors(), config,
                                 10, NullLogProvider.getInstance() ) ),
-                emptySetOf( ClusterAction.class )
+                emptySet()
         );
 
         state = state.performAction( new MessageDeliveryAction( Message.to( ClusterMessage.create,
diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/correctness/TestProver.java b/enterprise/ha/src/test/java/org/neo4j/ha/correctness/TestProver.java
index d048102ec9387..bc08f4236752c 100644
--- a/enterprise/ha/src/test/java/org/neo4j/ha/correctness/TestProver.java
+++ b/enterprise/ha/src/test/java/org/neo4j/ha/correctness/TestProver.java
@@ -31,9 +31,9 @@
 import org.neo4j.logging.NullLogProvider;
 
 import static java.util.Arrays.asList;
+import static java.util.Collections.emptySet;
 import static junit.framework.TestCase.assertEquals;
 import static org.neo4j.ha.correctness.ClusterInstance.newClusterInstance;
-import static org.neo4j.helpers.collection.Iterators.emptySetOf;
 
 public class TestProver
 {
@@ -56,7 +56,7 @@ public void aClusterSnapshotShouldEqualItsOrigin() throws Exception
                                 new Monitors(), config, 10, NullLogProvider.getInstance() ),
                         newClusterInstance( new InstanceId( 3 ), new URI( "cluster://localhost:5003" ),
                                 new Monitors(), config, 10, NullLogProvider.getInstance() ) ),
-                emptySetOf( ClusterAction.class )
+                emptySet()
         );
 
         // When
@@ -85,7 +85,7 @@ public void twoStatesWithSameSetupAndPendingMessagesShouldBeEqual() throws Excep
                                 new Monitors(), config, 10, NullLogProvider.getInstance() ),
                         newClusterInstance( new InstanceId( 3 ), new URI( "cluster://localhost:5003" ),
                                 new Monitors(), config, 10, NullLogProvider.getInstance() ) ),
-                emptySetOf( ClusterAction.class )
+                emptySet()
         );
 
         // When
diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPITest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPITest.java
index 79d1db9a543c8..204235560d513 100644
--- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPITest.java
+++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPITest.java
@@ -57,7 +57,7 @@ public void flushStoreFilesWithCorrectCheckpointTriggerName() throws IOException
         CheckPointer checkPointer = mock( CheckPointer.class );
 
         NeoStoreDataSource dataSource = mock( NeoStoreDataSource.class );
-        when( dataSource.listStoreFiles( anyBoolean() ) ).thenReturn( Iterators.emptyIterator() );
+        when( dataSource.listStoreFiles( anyBoolean() ) ).thenReturn( Iterators.emptyResourceIterator() );
 
         DefaultMasterImplSPI master = new DefaultMasterImplSPI( mock( GraphDatabaseAPI.class, RETURNS_MOCKS ),
                 mock( FileSystemAbstraction.class ), new Monitors(), mock( LabelTokenHolder.class ),
diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/AbstractConstraintCreationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/AbstractConstraintCreationIT.java
index 98cd29230dd43..d8468d3d2ffcb 100644
--- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/AbstractConstraintCreationIT.java
+++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/AbstractConstraintCreationIT.java
@@ -50,10 +50,10 @@
 import org.neo4j.kernel.api.exceptions.schema.NoSuchConstraintException;
 import org.neo4j.kernel.api.schema.SchemaDescriptor;
 import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor;
-import org.neo4j.kernel.api.schema.index.IndexDescriptor;
 import org.neo4j.kernel.api.security.SecurityContext;
 import org.neo4j.test.TestEnterpriseGraphDatabaseFactory;
 
+import static java.util.Collections.emptySet;
 import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.startsWith;
@@ -63,7 +63,6 @@
 import static org.junit.Assert.fail;
 import static org.neo4j.helpers.collection.Iterators.asCollection;
 import static org.neo4j.helpers.collection.Iterators.asSet;
-import static org.neo4j.helpers.collection.Iterators.emptySetOf;
 import static org.neo4j.helpers.collection.Iterators.single;
 
 public abstract class AbstractConstraintCreationIT<Constraint extends ConstraintDescriptor, DESCRIPTOR extends SchemaDescriptor>
@@ -326,7 +325,7 @@ public void shouldNotDropConstraintThatDoesNotExist() throws Exception
         // then
         {
             ReadOperations statement = readOperationsInNewTransaction();
-            assertEquals( emptySetOf( IndexDescriptor.class ), asSet( statement.indexesGetAll() ) );
+            assertEquals( emptySet(), asSet( statement.indexesGetAll() ) );
             commit();
         }
     }
diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java
index 2c340b786cc78..e9df355ef0abb 100644
--- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java
+++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java
@@ -54,13 +54,13 @@
 import org.neo4j.kernel.impl.store.record.ConstraintRule;
 import org.neo4j.kernel.impl.store.record.IndexRule;
 
+import static java.util.Collections.emptySet;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.helpers.collection.Iterators.asSet;
-import static org.neo4j.helpers.collection.Iterators.emptySetOf;
 import static org.neo4j.helpers.collection.Iterators.single;
 
 public class UniquenessConstraintCreationIT
@@ -196,7 +196,7 @@ public void shouldDropCreatedConstraintIndexWhenRollingBackConstraintCreation()
 
         // then
         ReadOperations readOperations = readOperationsInNewTransaction();
-        assertEquals( emptySetOf( IndexDescriptor.class ), asSet( readOperations.indexesGetAll() ) );
+        assertEquals( emptySet(), asSet( readOperations.indexesGetAll() ) );
         commit();
     }
 
@@ -276,7 +276,7 @@ public void shouldDropConstraintIndexWhenDroppingConstraint() throws Exception
 
         // then
         ReadOperations readOperations = readOperationsInNewTransaction();
-        assertEquals( emptySetOf( IndexDescriptor.class ), asSet( readOperations.indexesGetAll() ) );
+        assertEquals( emptySet(), asSet( readOperations.indexesGetAll() ) );
         commit();
     }