diff --git a/pom.xml b/pom.xml
index dba327a95..345ca275e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -229,6 +229,13 @@
                         <exclude>net/openhft/chronicle/map/VanillaChronicleMap.java</exclude>
                         <exclude>net/openhft/chronicle/map/ReplicatedChronicleMap.java</exclude>
                         <exclude>net/openhft/chronicle/map/Replica.java</exclude>
+                        <exclude>net/openhft/chronicle/map/ServiceDescriptor.java</exclude>
+                        <exclude>net/openhft/chronicle/hash/Segment.java</exclude>
+                        <exclude>net/openhft/chronicle/map/MapEventListener.java</exclude>
+                        <exclude>net/openhft/chronicle/map/MapEntryCallback.java</exclude>
+                        <exclude>net/openhft/chronicle/hash/KeyContext.java</exclude>
+                        <exclude>net/openhft/chronicle/map/MapKeyContext.java</exclude>
+                        <exclude>net/openhft/chronicle/hash/locks/LockingStrategy.java</exclude>
                     </sourceFileExcludes>
                     <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>
diff --git a/src/main/java/net/openhft/chronicle/hash/locks/LockingStrategy.java b/src/main/java/net/openhft/chronicle/hash/locks/LockingStrategy.java
index 6f6a336ad..7677ae6ec 100644
--- a/src/main/java/net/openhft/chronicle/hash/locks/LockingStrategy.java
+++ b/src/main/java/net/openhft/chronicle/hash/locks/LockingStrategy.java
@@ -16,6 +16,11 @@
 
 package net.openhft.chronicle.hash.locks;
 
+/**
+ * @deprecated never implemented and replaced with strategies in
+ * {@link net.openhft.chronicle.algo.locks} 
+ */
+@Deprecated
 public interface LockingStrategy {
 
     void lock(InterProcessLock lock);
diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java
index 7cc357dfa..59f5e33a4 100755
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java
@@ -142,6 +142,11 @@ public interface ChronicleMap<K, V>
      */
     V acquireUsing(@NotNull K key, V usingValue);
 
+    /**
+     * @deprecated this method has incoherent, unclear semantics. Use {@link #queryContext(Object)}
+     * instead
+     */
+    @Deprecated
     @NotNull
     MapKeyContext<K, V> acquireContext(@NotNull K key, @NotNull V usingValue);
 
diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
index addaa048c..6813fdd82 100755
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
@@ -1155,7 +1155,9 @@ public final class ChronicleMapBuilder<K, V> implements
      * @param defaultValueProvider the strategy to obtain a default value by the absent key
      * @return this builder object back
      * @see #defaultValue(Object)
+     * @deprecated specialize {@link MapEntryOperations#defaultValue(MapAbsentEntry)} instead
      */
+    @Deprecated
     public ChronicleMapBuilder<K, V> defaultValueProvider(
             @NotNull DefaultValueProvider<K, V> defaultValueProvider) {
         this.defaultValueProvider = defaultValueProvider;