diff --git a/src/world/Manager/TaskMgr.cpp b/src/world/Manager/TaskMgr.cpp
index 70e91a3b..ebcc203c 100644
--- a/src/world/Manager/TaskMgr.cpp
+++ b/src/world/Manager/TaskMgr.cpp
@@ -10,12 +10,13 @@ using namespace Sapphire::World;
 void TaskMgr::update( uint64_t tickCount )
 {
 
-  for( auto it = m_taskList.begin(); it != m_taskList.end();  )
+  for( auto it = m_taskList.begin(); it != m_taskList.end(); )
   {
     auto pTask = *it;
     // is the task ready for execution?
     if( ( tickCount - pTask->getQueueTimeMs() ) >= pTask->getDelayTimeMs() )
     {
+      Logger::info( pTask->toString() );
       pTask->execute();
       it = m_taskList.erase( it );
     }
diff --git a/src/world/Task/RemoveBNpcTask.cpp b/src/world/Task/RemoveBNpcTask.cpp
index 29c95eab..f6236793 100644
--- a/src/world/Task/RemoveBNpcTask.cpp
+++ b/src/world/Task/RemoveBNpcTask.cpp
@@ -23,7 +23,6 @@ void RemoveBNpcTask::onQueue()
 
 void RemoveBNpcTask::execute()
 {
-  Logger::info( toString() );
 
   auto teriMgr = Common::Service< World::Manager::TerritoryMgr >::ref();
   auto pZone = teriMgr.getTerritoryByGuId( m_pBNpc->getTerritoryId() );
diff --git a/src/world/WorldServer.cpp b/src/world/WorldServer.cpp
index 7f4f2b9e..8a5f8059 100644
--- a/src/world/WorldServer.cpp
+++ b/src/world/WorldServer.cpp
@@ -263,10 +263,6 @@ void WorldServer::run( int32_t argc, char* argv[] )
 
   Logger::info( "World server running on {0}:{1}", m_ip, m_port );
 
-  taskMgr->queueTask( std::make_shared< Sapphire::World::TestTask >( 10000 ) );
-  taskMgr->queueTask( std::make_shared< Sapphire::World::TestTask >( 5000 ) );
-  taskMgr->queueTask( std::make_shared< Sapphire::World::TestTask >( 2000 ) );
-
   mainLoop();
 
   for( auto& thread_entry : thread_list )