diff --git a/include/maxscale/debug.h b/include/maxscale/debug.h
index 9370def5c..64973e68e 100644
--- a/include/maxscale/debug.h
+++ b/include/maxscale/debug.h
@@ -474,7 +474,6 @@ typedef enum skygw_chk_t
         ss_info_dassert(d->dcb_chk_top == CHK_NUM_DCB &&        \
                 d->dcb_chk_tail == CHK_NUM_DCB,                 \
                         "Dcb under- or overflow");              \
-        CHK_MANAGED_LIST(d)                                     \
         }
 
 #define CHK_PROTOCOL(p) {                                               \
@@ -487,7 +486,6 @@ typedef enum skygw_chk_t
             ss_info_dassert(s->ses_chk_top == CHK_NUM_SESSION &&        \
                             s->ses_chk_tail == CHK_NUM_SESSION,         \
                             "Session under- or overflow");              \
-            CHK_MANAGED_LIST(s)                                         \
     }
 
 #define CHK_SERVER(s) {                                          \
diff --git a/server/core/dcb.c b/server/core/dcb.c
index 32863a88a..87b9bca5a 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -377,7 +377,8 @@ void
 dcb_free_all_memory(DCB *dcb)
 {
     DCB_CALLBACK *cb_dcb;
-    ss_dassert(dcb->entry_is_in_use);
+    // TODO: Uncomment once listmanager code is in use
+    //ss_dassert(dcb->entry_is_in_use);
 
     if (dcb->protocol && (!DCB_IS_CLONE(dcb)))
     {
@@ -1842,10 +1843,12 @@ void printAllDCBs()
 void
 dprintOneDCB(DCB *pdcb, DCB *dcb)
 {
+/* TODO: Uncomment once listmanager code is in use
     if (false == dcb->entry_is_in_use)
     {
         return;
     }
+*/
     dcb_printf(pdcb, "DCB: %p\n", (void *)dcb);
     dcb_printf(pdcb, "\tDCB state:          %s\n",
                gw_dcb_state2string(dcb->state));