diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
index 65abcd1bb..d27c5d9ba 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -113,8 +113,6 @@ public class ReplicatedChronicleMap<K, V, R> extends VanillaChronicleMap<K, V, R
     public transient TimeUnit cleanupTimeoutUnit;
     
     public transient MapRemoteOperations<K, V, R> remoteOperations;
-    transient CompiledReplicatedMapQueryContext<K, V, R> remoteOpContext;
-    transient CompiledReplicatedMapIterationContext<K, V, R> remoteItContext;
 
     transient BitSetFrame mainSegmentsModIterFrameForUpdates;
     transient BitSetFrame mainSegmentsModIterFrameForIteration;
@@ -478,28 +476,6 @@ public class ReplicatedChronicleMap<K, V, R> extends VanillaChronicleMap<K, V, R
                 ci -> new CompiledReplicatedMapQueryContext<>(ci, this));
     }
 
-    /**
-     * Assumed to be called from a single thread - the replication thread. Not to waste time
-     * for going into replication thread's threadLocal map, cache the context in Map's field
-     */
-    private CompiledReplicatedMapQueryContext<K, V, R> remoteOpContext() {
-        if (remoteOpContext == null) {
-            remoteOpContext = (CompiledReplicatedMapQueryContext<K, V, R>) q();
-        }
-        assert !remoteOpContext.usedInit();
-        remoteOpContext.initUsed(true);
-        return remoteOpContext;
-    }
-
-    private CompiledReplicatedMapIterationContext<K, V, R> remoteItContext() {
-        if (remoteItContext == null) {
-            remoteItContext = (CompiledReplicatedMapIterationContext<K, V, R>) i();
-        }
-        assert !remoteItContext.usedInit();
-        remoteItContext.initUsed(true);
-        return remoteItContext;
-    }
-
     /**
      * This method does not set a segment lock, A segment lock should be obtained before calling
      * this method, especially when being used in a multi threaded context.