diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp
index 9536ff24f..3be44d2b8 100644
--- a/dbcon/mysql/ha_calpont_impl.cpp
+++ b/dbcon/mysql/ha_calpont_impl.cpp
@@ -2015,7 +2015,6 @@ extern "C"
         Oam oam;
         DBRM dbrm(true);
         SystemStatus systemstatus;
-        WriteEngine::FileOp fileOp;
 
         try
         {
@@ -2023,15 +2022,8 @@ extern "C"
 
             if (systemstatus.SystemOpState == ACTIVE
                     && dbrm.getSystemReady()
-                    && dbrm.getSystemQueryReady()
-                    && fileOp.existsOIDDir(1001))
+                    && dbrm.getSystemQueryReady())
             {
-                // Test getting system catalogue data from ExeMgr
-                boost::shared_ptr<execplan::CalpontSystemCatalog> systemCatalogPtr =
-                    execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(0);
-                systemCatalogPtr->identity(execplan::CalpontSystemCatalog::FE);
-                systemCatalogPtr->getTableCount();
-
                 return 1;
             }
         }