diff --git a/src/remote/blockingTCPConnector.cpp b/src/remote/blockingTCPConnector.cpp
index fb08e78..974c759 100644
--- a/src/remote/blockingTCPConnector.cpp
+++ b/src/remote/blockingTCPConnector.cpp
@@ -89,6 +89,9 @@ Transport::shared_pointer BlockingTCPConnector::connect(TransportClient::shared_
             return transport;
     }
 
+    /* TODO: bound map<> size
+     * Lazy creates a lock for each 'address' ever encountered.
+     */
     bool lockAcquired = _namedLocker.acquireSynchronizationObject(&address, LOCK_TIMEOUT);
     if(lockAcquired) {
         try {
diff --git a/src/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp
index 7bd1f61..88a4f7c 100644
--- a/src/remoteClient/clientContextImpl.cpp
+++ b/src/remoteClient/clientContextImpl.cpp
@@ -4282,7 +4282,7 @@ public:
     InternalClientContextImpl(const Configuration::shared_pointer& conf) :
         m_addressList(""), m_autoAddressList(true), m_connectionTimeout(30.0f), m_beaconPeriod(15.0f),
         m_broadcastPort(PVA_BROADCAST_PORT), m_receiveBufferSize(MAX_TCP_RECV),
-        m_namedLocker(), m_lastCID(0), m_lastIOID(0),
+        m_lastCID(0), m_lastIOID(0),
         m_version("pvAccess Client", "cpp",
                   EPICS_PVA_MAJOR_VERSION,
                   EPICS_PVA_MINOR_VERSION,
@@ -4901,11 +4901,6 @@ private:
      */
     ClientResponseHandler::shared_pointer m_responseHandler;
 
-    /**
-     * Context instance.
-     */
-    NamedLockPattern<string> m_namedLocker;
-
     /**
      * Context instance.
      */