diff --git a/maxutils/maxbase/include/maxbase/worker.hh b/maxutils/maxbase/include/maxbase/worker.hh
index eb10b202d..56e7311fe 100644
--- a/maxutils/maxbase/include/maxbase/worker.hh
+++ b/maxutils/maxbase/include/maxbase/worker.hh
@@ -298,10 +298,8 @@ public:
     enum state_t
     {
         STOPPED,
-        IDLE,
         POLLING,
         PROCESSING,
-        ZPROCESSING
     };
 
     enum execute_mode_t
diff --git a/maxutils/maxbase/src/worker.cc b/maxutils/maxbase/src/worker.cc
index 2d3c74067..b1546fd12 100644
--- a/maxutils/maxbase/src/worker.cc
+++ b/maxutils/maxbase/src/worker.cc
@@ -535,7 +535,7 @@ void Worker::run(mxb::Semaphore* pSem)
 
     if (pre_run())
     {
-        m_state = IDLE;
+        m_state = PROCESSING;
 
         if (pSem)
         {
@@ -886,8 +886,6 @@ void Worker::poll_waitevents()
         }
 
         epoll_tick();
-
-        m_state = IDLE;
     }   /*< while(1) */
 }
 
diff --git a/server/core/poll.cc b/server/core/poll.cc
index 5a8148d55..540e700c9 100644
--- a/server/core/poll.cc
+++ b/server/core/poll.cc
@@ -152,10 +152,6 @@ void dShowThreads(DCB* dcb)
             state = "Stopped";
             break;
 
-        case Worker::IDLE:
-            state = "Idle";
-            break;
-
         case Worker::POLLING:
             state = "Polling";
             break;
@@ -164,10 +160,6 @@ void dShowThreads(DCB* dcb)
             state = "Processing";
             break;
 
-        case Worker::ZPROCESSING:
-            state = "Collecting";
-            break;
-
         default:
             mxb_assert(!true);
         }
diff --git a/server/core/routingworker.cc b/server/core/routingworker.cc
index accbe76e2..1ef8776df 100644
--- a/server/core/routingworker.cc
+++ b/server/core/routingworker.cc
@@ -625,8 +625,6 @@ void RoutingWorker::epoll_tick()
 {
     dcb_process_idle_sessions(m_id);
 
-    m_state = ZPROCESSING;
-
     delete_zombies();
 
     check_systemd_watchdog();