diff --git a/src/core/airspacemonitor.cpp b/src/core/airspacemonitor.cpp
index bf7490d0f..15ac46287 100644
--- a/src/core/airspacemonitor.cpp
+++ b/src/core/airspacemonitor.cpp
@@ -313,13 +313,6 @@ namespace swift::core
         }
     }
 
-    bool CAirspaceMonitor::enableAnalyzer(bool enable)
-    {
-        if (!this->analyzer()) { return false; }
-        this->analyzer()->setEnabled(enable);
-        return true;
-    }
-
     void CAirspaceMonitor::testCreateDummyOnlineAtcStations(int number)
     {
         if (number < 1) { return; }
@@ -413,11 +406,7 @@ namespace swift::core
         m_foundInElevationsOnGnd = 0;
     }
 
-    void CAirspaceMonitor::gracefulShutdown()
-    {
-        if (m_analyzer) { m_analyzer->setEnabled(false); }
-        QObject::disconnect(this);
-    }
+    void CAirspaceMonitor::gracefulShutdown() { QObject::disconnect(this); }
 
     int CAirspaceMonitor::reInitializeAllAircraft()
     {
diff --git a/src/core/airspacemonitor.h b/src/core/airspacemonitor.h
index 4b5ca72b8..0b9894cf7 100644
--- a/src/core/airspacemonitor.h
+++ b/src/core/airspacemonitor.h
@@ -120,9 +120,6 @@ namespace swift::core
         //! Analyzer
         CAirspaceAnalyzer *analyzer() const { return m_analyzer; }
 
-        //! \copydoc CAirspaceAnalyzer::setEnabled
-        bool enableAnalyzer(bool enable);
-
         //! Gracefully shut down, e.g. for thread safety
         void gracefulShutdown();
 
diff --git a/src/core/context/contextnetworkimpl.cpp b/src/core/context/contextnetworkimpl.cpp
index 41cfda541..f8c0e237a 100644
--- a/src/core/context/contextnetworkimpl.cpp
+++ b/src/core/context/contextnetworkimpl.cpp
@@ -386,8 +386,8 @@ namespace swift::core::context
         if (commandLine.isEmpty()) { return false; }
 
         static const QStringList cmds({ ".msg", ".m", ".chat", ".altos", ".altoffset", ".addtimeos", ".addtimeoffset",
-                                        ".wallop", ".watchdog", ".reinit", ".reinitialize", ".enable", ".disable",
-                                        ".ignore", ".unignore", ".fsd" });
+                                        ".wallop", ".reinit", ".reinitialize", ".enable", ".disable", ".ignore",
+                                        ".unignore", ".fsd" });
         CSimpleCommandParser parser(cmds);
         parser.parse(commandLine);
         if (!parser.isKnownCommand()) { return false; }
@@ -526,15 +526,6 @@ namespace swift::core::context
             }
             else { CLogMessage(this).info(u"Reset add. time offset"); }
         }
-        else if (parser.matchesCommand(".watchdog"))
-        {
-            if (!m_airspace) { return false; }
-            if (parser.countParts() < 2) { return false; }
-
-            const bool watchdog = parser.toBool(1, true);
-            m_airspace->enableAnalyzer(watchdog);
-            CLogMessage(this).info(u"Enabled watchdog: %1") << boolToYesNo(watchdog);
-        }
         else if (parser.matchesCommand(".reinit", ".reinitialize"))
         {
             if (!m_airspace) { return false; }
diff --git a/src/misc/worker.h b/src/misc/worker.h
index ef6f07325..2d970c197 100644
--- a/src/misc/worker.h
+++ b/src/misc/worker.h
@@ -299,10 +299,6 @@ namespace swift::misc
         //! \threadsafe
         bool isEnabled() const { return m_enabled; }
 
-        //! Enabled (running)?
-        //! \threadsafe
-        void setEnabled(bool enabled) { m_enabled = enabled; }
-
         //! Start updating (start/stop timer)
         //! \threadsafe
         void startUpdating(int updateTimeSecs);
@@ -336,6 +332,10 @@ namespace swift::misc
         //! Called after cleanup().
         void finish();
 
+        //! Enabled (running)?
+        //! \threadsafe
+        void setEnabled(bool enabled) { m_enabled = enabled; }
+
         using CWorkerBase::setStarted;
         using CWorkerBase::setFinished;