diff --git a/writeengine/server/we_dmlcommandproc.cpp b/writeengine/server/we_dmlcommandproc.cpp
index 1ca4d1d7c..1a20d1eae 100644
--- a/writeengine/server/we_dmlcommandproc.cpp
+++ b/writeengine/server/we_dmlcommandproc.cpp
@@ -722,6 +722,10 @@ uint8_t WE_DMLCommandProc::processSingleInsert(messageqcpp::ByteStream& bs, std:
         }
     }
 
+    // MCOL-1495 Remove fCatalogMap entries CS won't use anymore.
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId);
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId | 0x80000000);
+
     return rc;
 }
 
@@ -1361,7 +1365,9 @@ uint8_t WE_DMLCommandProc::processBatchInsert(messageqcpp::ByteStream& bs, std::
         }
     }
 
-    //cout << "Batch insert return code " << rc << endl;
+    // MCOL-1495 Remove fCatalogMap entries CS won't use anymore.
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId);
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId | 0x80000000);
     return rc;
 }
 
@@ -2087,18 +2093,11 @@ uint8_t WE_DMLCommandProc::processBatchInsertBinary(messageqcpp::ByteStream& bs,
         args.add(cols);
         err = IDBErrorInfo::instance()->errorMsg(WARN_DATA_TRUNC, args);
 
-        // Strict mode enabled, so rollback on warning
-        // NOTE: This doesn't seem to be a possible code path yet
-        /*if (insertPkg.get_isWarnToError())
-        {
-        		string applName ("BatchInsert");
-        		fWEWrapper.bulkRollback(tblOid,txnid.id,tableName.toString(),
-        			applName, false, err);
-        		BulkRollbackMgr::deleteMetaFile( tblOid );
-        }*/
-    }
+   }
 
-    //cout << "Batch insert return code " << rc << endl;
+    // MCOL-1495 Remove fCatalogMap entries CS won't use anymore.
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId);
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId | 0x80000000);
     return rc;
 }
 
@@ -2240,6 +2239,9 @@ uint8_t WE_DMLCommandProc::commitBatchAutoOn(messageqcpp::ByteStream& bs, std::s
         fWEWrapper.getDictMap().erase(txnID);
     }
 
+    // MCOL-1495 Remove fCatalogMap entries CS won't use anymore.
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId);
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId | 0x80000000);
     return rc;
 }
 
@@ -3772,7 +3774,6 @@ uint8_t WE_DMLCommandProc::processUpdate(messageqcpp::ByteStream& bs,
         err = IDBErrorInfo::instance()->errorMsg(WARN_DATA_TRUNC, args);
     }
 
-    //cout << "finished update" << endl;
     return rc;
 }
 
@@ -3955,6 +3956,10 @@ uint8_t WE_DMLCommandProc::processFlushFiles(messageqcpp::ByteStream& bs, std::s
     //if (idbdatafile::IDBPolicy::useHdfs())
     //		cacheutils::dropPrimProcFdCache();
     TableMetaData::removeTableMetaData(tableOid);
+
+    // MCOL-1495 Remove fCatalogMap entries CS won't use anymore.
+    CalpontSystemCatalog::removeCalpontSystemCatalog(txnId);
+    CalpontSystemCatalog::removeCalpontSystemCatalog(txnId | 0x80000000);
     return rc;
 }
 
@@ -4130,7 +4135,6 @@ uint8_t WE_DMLCommandProc::processDelete(messageqcpp::ByteStream& bs,
         }
     }
 
-    //cout << "WES return rc " << (int)rc << " with msg " << err << endl;
     return rc;
 }