diff --git a/src/main/java/net/openhft/chronicle/map/impl/CompiledMapQueryContext.java b/src/main/java/net/openhft/chronicle/map/impl/CompiledMapQueryContext.java
index a350e24d9..047a9d234 100644
--- a/src/main/java/net/openhft/chronicle/map/impl/CompiledMapQueryContext.java
+++ b/src/main/java/net/openhft/chronicle/map/impl/CompiledMapQueryContext.java
@@ -20,7 +20,6 @@ package net.openhft.chronicle.map.impl;
 
 import net.openhft.chronicle.algo.hashing.LongHashFunction;
 import net.openhft.chronicle.bytes.Access;
-import net.openhft.chronicle.bytes.Accessor;
 import net.openhft.chronicle.bytes.Accessor.Full;
 import net.openhft.chronicle.bytes.ReadAccess;
 import net.openhft.chronicle.hash.AbstractData;
@@ -36,7 +35,6 @@ import net.openhft.chronicle.hash.serialization.internal.MetaBytesInterop;
 import net.openhft.chronicle.map.*;
 import net.openhft.chronicle.map.impl.ret.InstanceReturnValue;
 import net.openhft.chronicle.map.impl.ret.UsableReturnValue;
-import net.openhft.chronicle.map.impl.stage.query.MapAbsentEntryHolder;
 import net.openhft.chronicle.map.impl.value.instance.ValueInitableData;
 import net.openhft.lang.Maths;
 import net.openhft.lang.MemoryUnit;
diff --git a/src/main/java/net/openhft/chronicle/map/impl/CompiledReplicatedMapQueryContext.java b/src/main/java/net/openhft/chronicle/map/impl/CompiledReplicatedMapQueryContext.java
index fee22dcb1..9fe5d1510 100644
--- a/src/main/java/net/openhft/chronicle/map/impl/CompiledReplicatedMapQueryContext.java
+++ b/src/main/java/net/openhft/chronicle/map/impl/CompiledReplicatedMapQueryContext.java
@@ -2,7 +2,6 @@ package net.openhft.chronicle.map.impl;
 
 import net.openhft.chronicle.algo.hashing.LongHashFunction;
 import net.openhft.chronicle.bytes.Access;
-import net.openhft.chronicle.bytes.Accessor;
 import net.openhft.chronicle.bytes.Accessor.Full;
 import net.openhft.chronicle.bytes.ReadAccess;
 import net.openhft.chronicle.hash.*;
@@ -21,7 +20,6 @@ import net.openhft.chronicle.map.*;
 import net.openhft.chronicle.map.TcpReplicator.TcpSocketChannelEntryWriter;
 import net.openhft.chronicle.map.impl.ret.InstanceReturnValue;
 import net.openhft.chronicle.map.impl.ret.UsableReturnValue;
-import net.openhft.chronicle.map.impl.stage.query.MapAbsentEntryHolder;
 import net.openhft.chronicle.map.impl.value.instance.ValueInitableData;
 import net.openhft.chronicle.map.replication.MapRemoteQueryContext;
 import net.openhft.chronicle.map.replication.MapReplicableEntry;
diff --git a/src/main/java/net/openhft/chronicle/map/impl/MapAbsentEntryHolder.java b/src/main/java/net/openhft/chronicle/map/impl/MapAbsentEntryHolder.java
new file mode 100644
index 000000000..44f1b30d0
--- /dev/null
+++ b/src/main/java/net/openhft/chronicle/map/impl/MapAbsentEntryHolder.java
@@ -0,0 +1,8 @@
+package net.openhft.chronicle.map.impl;
+
+import net.openhft.chronicle.map.MapAbsentEntry;
+
+public interface MapAbsentEntryHolder<K, V> {
+
+    MapAbsentEntry<K, V> absent();
+}