diff --git a/configure.ac b/configure.ac
index 59f8f02..dd618f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -640,11 +640,6 @@ src/agents/antispam/Makefile
 src/agents/avirus/Makefile
 src/agents/calcmd/Makefile
 src/agents/collector/Makefile
-src/agents/connmgr/Makefile
-src/agents/connmgr/cmmodules/lists/Makefile
-src/agents/connmgr/cmmodules/rbl/Makefile
-src/agents/connmgr/cmmodules/rdns/Makefile
-src/agents/connmgr/cmmodules/user/Makefile
 src/agents/generic/Makefile
 src/agents/imap/Makefile
 src/agents/imap/tests/Makefile
@@ -691,7 +686,6 @@ src/libs/python/bongo/Xpl.py
 src/libs/bongoutil/Makefile
 src/libs/bongoutil/tests/Makefile
 src/libs/xpl/Makefile
-src/libs/connmgr/Makefile
 src/www/Makefile
 src/www/bongo.conf
 zoneinfo/Makefile
diff --git a/src/agents/smtp/smtpd.c b/src/agents/smtp/smtpd.c
index ed21899..55fc4d5 100644
--- a/src/agents/smtp/smtpd.c
+++ b/src/agents/smtp/smtpd.c
@@ -4915,12 +4915,15 @@ ReadConfiguration (void)
     }
     MDBFreeValues (Config);
 
+    /* FIXME. This should be replaced by pulling config from the store. */
+#if 0
     if (MsgReadIP (MSGSRV_AGENT_SMTP, MSGSRV_A_QUEUE_SERVER, Config)) {
         strcpy (NMAPServer, Config->Value[0]);
         Log(LOG_INFO, "Configuration string %s Value %s",
             "MSGSRV_A_QUEUE_SERVER", Config->Value[0]);
     }
     MDBFreeValues (Config);
+#endif
 
     if (RelayHost[0] == '\0') {
         if (MDBRead (MSGSRV_AGENT_SMTP, MSGSRV_A_RELAYHOST, Config) > 0) {
diff --git a/src/libs/msgapi/msgapi.c b/src/libs/msgapi/msgapi.c
index ef29f4c..587641e 100644
--- a/src/libs/msgapi/msgapi.c
+++ b/src/libs/msgapi/msgapi.c
@@ -333,50 +333,6 @@ MsgFindObject(const unsigned char *user, unsigned char *dn, unsigned char *userT
     return(retVal);
 }
 
-EXPORT BOOL
-MsgReadIP(const unsigned char *object, unsigned char *type, MDBValueStruct *v)
-{
-    int first,last, i;
-    unsigned char *ptr;
-
-    if (!v || !type) {
-        return(FALSE);
-    }
-
-    first=v->Used;
-
-    if (!object) {
-        if (!MDBReadDN(MsgGlobal.server.dn, type, v)) {
-            return(FALSE);
-        }
-    } else {
-        if (!MDBReadDN(object, type, v)) {
-            return(FALSE);
-        }
-    }
-
-    last = v->Used;
-
-    for (i = first; i < last; i++) {
-        if ((ptr = strrchr(v->Value[i], '\\')) != NULL) {
-            *ptr = '\0';
-        }
-        MDBRead(v->Value[i], MSGSRV_A_IP_ADDRESS, v);
-    }
-
-    /* The following loop removes the names read by the ReadDN above,
-     * but keeps the IP addresses added afterwards :-) */
-    for (i = first; i < last; i++) {
-        MDBFreeValue(0, v);
-    }
-
-    if (v->Used > 0) {
-        return(TRUE);
-    } else {
-        return(FALSE);
-    }
-}
-
 EXPORT BOOL
 MsgDomainExists(const unsigned char *domain, unsigned char *domainObjectDN)
 {
@@ -899,10 +855,6 @@ MsgLibraryStart(void)
     MDBFreeValues(MsgGlobal.vs.server.names);
     MsgGlobal.address.local = inet_addr(MsgGlobal.address.string);
 
-    /* This stuff is here to prevent a catch-22 with the IP address configuration above */
-    if (MsgReadIP(MsgGlobal.server.dn, MSGSRV_A_CONNMGR, config)) {
-        MsgGlobal.connManager = inet_addr(config->Value[0]);
-    }
     MDBFreeValues(config);
 
     LoadContextList(config);