diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyConcurrentMaps.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyConcurrentMaps.java
index 76f500f65..0ad216518 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyConcurrentMaps.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyConcurrentMaps.java
@@ -26,7 +26,7 @@ import java.util.Map;
  */
 public class ProxyConcurrentMaps extends ProxyMaps {
 	/**
-     * Call before invoking {@link Map#remove} on super.
+     * Call before invoking {@link Map#remove(key, value) } on super.
      */
     public static boolean beforeRemove(ProxyMap map, Object key, Object value) {
         dirty(map, false);
@@ -34,7 +34,7 @@ public class ProxyConcurrentMaps extends ProxyMaps {
     }
     
     /**
-     * Call after invoking {@link Map#remove} on super.
+     * Call after invoking {@link Map#remove(key, value) } on super.
      *
      * @param ret the return value from the super's method
      * @param before the return value from {@link #beforeRemove}
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
index e71c91dba..b84028134 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
@@ -58,7 +58,6 @@ import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.Options;
 
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 
 import serp.bytecode.BCClass;
 import serp.bytecode.BCField;
@@ -632,8 +631,7 @@ public class ProxyManagerImpl
         delegateConstructors(bc, type);
         addProxyMethods(bc, false);
         addProxyMapMethods(bc, type);
-        Class<? extends ProxyMaps> mapProxyClassType =
-            ConcurrentMap.class.isAssignableFrom(type) ? ProxyConcurrentMaps.class : ProxyMaps.class;
+        Class<? extends ProxyMaps> mapProxyClassType = ProxyConcurrentMaps.class;
         proxyRecognizedMethods(bc, type, mapProxyClassType, ProxyMap.class);
         proxySetters(bc, type);
         addWriteReplaceMethod(bc, runtime);
@@ -1338,7 +1336,7 @@ public class ProxyManagerImpl
 
             // first check for overriding method 
             try {
-                match = helper.getMethod(meths[i].getName(), params); 
+                match = helper.getMethod(meths[i].getName(), params);
                 proxyOverrideMethod(bc, meths[i], match, params);
                 continue;
             } catch (NoSuchMethodException nsme) {