diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp
index d7af7ed78..2afa92ea7 100644
--- a/src/blackcore/simulator.cpp
+++ b/src/blackcore/simulator.cpp
@@ -44,11 +44,6 @@ namespace BlackCore
         return setup;
     }
 
-    bool ISimulator::isShuttingDownOrDisconnected() const
-    {
-        return (this->isShuttingDown() || !this->isConnected());
-    }
-
     bool ISimulator::requestElevation(const Geo::ICoordinateGeodetic &reference, const CCallsign &callsign)
     {
         Q_UNUSED(reference);
diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h
index c1037ae26..ef5cfa999 100644
--- a/src/blackcore/simulator.h
+++ b/src/blackcore/simulator.h
@@ -12,6 +12,7 @@
 #ifndef BLACKCORE_SIMULATOR_H
 #define BLACKCORE_SIMULATOR_H
 
+#include "blackcore/application.h"
 #include "blackcore/blackcoreexport.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
@@ -157,7 +158,11 @@ namespace BlackCore
         virtual void highlightAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraftToHighlight, bool enableHighlight, const BlackMisc::PhysicalQuantities::CTime &displayTime) = 0;
 
         //! Follow aircraft
-        virtual bool followAircraft(const BlackMisc::Aviation::CCallsign &callsign) = 0;
+        virtual bool followAircraft(const BlackMisc::Aviation::CCallsign &callsign)
+        {
+            Q_UNUSED(callsign);
+            return false;
+        }
 
         //! Activates or deactivates simulator weather
         virtual void setWeatherActivated(bool activated) = 0;
@@ -172,7 +177,7 @@ namespace BlackCore
         virtual bool isPaused() const = 0;
 
         //! Simulator running?
-        virtual bool isSimulating() const = 0;
+        virtual bool isSimulating() const { return this->isConnected(); }
 
         //! Clear all aircraft related data
         virtual void clearAllRemoteAircraftData() = 0;
@@ -182,10 +187,11 @@ namespace BlackCore
         virtual BlackMisc::CStatusMessageList debugVerifyStateAfterAllAircraftRemoved() const = 0;
 
         //! Is overall (swift) application shutting down
-        virtual bool isShuttingDown() const = 0;
+        //! \threadsafe
+        virtual bool isShuttingDown() const { return (!sApp || sApp->isShuttingDown()); }
 
         //! Shutting down or disconnected?
-        virtual bool isShuttingDownOrDisconnected() const;
+        virtual bool isShuttingDownOrDisconnected() const { return (this->isShuttingDown() || !this->isConnected()); }
 
         //! \copydoc BlackMisc::Simulation::ISimulationEnvironmentProvider::requestElevation
         //! \remark needs to be overridden if the concrete driver supports such an option
diff --git a/src/blackcore/simulatorcommon.cpp b/src/blackcore/simulatorcommon.cpp
index 1db5be05e..f32863cf7 100644
--- a/src/blackcore/simulatorcommon.cpp
+++ b/src/blackcore/simulatorcommon.cpp
@@ -355,11 +355,6 @@ namespace BlackCore
         return true;
     }
 
-    bool CSimulatorCommon::isShuttingDown() const
-    {
-        return (!sApp || sApp->isShuttingDown());
-    }
-
     bool CSimulatorCommon::logicallyReAddRemoteAircraft(const CCallsign &callsign)
     {
         if (this->isShuttingDown()) { return false; }
@@ -413,12 +408,6 @@ namespace BlackCore
         }
     }
 
-    bool CSimulatorCommon::followAircraft(const CCallsign &callsign)
-    {
-        Q_UNUSED(callsign);
-        return false;
-    }
-
     int CSimulatorCommon::physicallyRemoveMultipleRemoteAircraft(const CCallsignSet &callsigns)
     {
         if (callsigns.isEmpty()) { return 0; }
diff --git a/src/blackcore/simulatorcommon.h b/src/blackcore/simulatorcommon.h
index e7fcb436d..f444a143c 100644
--- a/src/blackcore/simulatorcommon.h
+++ b/src/blackcore/simulatorcommon.h
@@ -72,13 +72,11 @@ namespace BlackCore
 
         // --------- ISimulator implementations ------------
         virtual void highlightAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraftToHighlight, bool enableHighlight, const BlackMisc::PhysicalQuantities::CTime &displayTime) override;
-        virtual bool followAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
         virtual const BlackMisc::Simulation::CSimulatorInternals &getSimulatorInternals() const override;
         virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const override;
         virtual void setWeatherActivated(bool activated) override;
         virtual void unload() override;
         virtual bool disconnectFrom() override;
-        virtual bool isShuttingDown() const override;
         virtual bool logicallyReAddRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
         virtual BlackMisc::Aviation::CCallsignSet unrenderedEnabledAircraft() const override;
         virtual BlackMisc::Aviation::CCallsignSet renderedDisabledAircraft() const override;
diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h
index 091ddcb3a..77294987d 100644
--- a/src/plugins/simulator/xplane/simulatorxplane.h
+++ b/src/plugins/simulator/xplane/simulatorxplane.h
@@ -152,9 +152,6 @@ namespace BlackSimPlugin
                 return false;
             }
 
-            //! \copydoc BlackCore::ISimulator::isSimulating
-            virtual bool isSimulating() const override { return isConnected(); }
-
             virtual bool physicallyAddRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &newRemoteAircraft) override;
             virtual bool physicallyRemoveRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
             virtual int physicallyRemoveAllRemoteAircraft() override;