diff --git a/src/blackinput/keyboard.h b/src/blackinput/keyboard.h
index f84b7af40..3e6d3aa06 100644
--- a/src/blackinput/keyboard.h
+++ b/src/blackinput/keyboard.h
@@ -22,7 +22,6 @@ namespace BlackInput
 {
     /*!
      * Abstract interface for native keyboard handling.
-     * \todo Add implementation for Linux and OSX.
      */
     class BLACKINPUT_EXPORT IKeyboard : public QObject
     {
diff --git a/src/plugins/simulator/fs9/fs9client.cpp b/src/plugins/simulator/fs9/fs9client.cpp
index 12d140fc6..ed306ebbf 100644
--- a/src/plugins/simulator/fs9/fs9client.cpp
+++ b/src/plugins/simulator/fs9/fs9client.cpp
@@ -199,7 +199,6 @@ namespace BlackSimPlugin
         {
             initDirectPlay();
             createDeviceAddress();
-            //enumDirectPlayHosts();
             connectToSession(m_callsign);
         }
 
diff --git a/src/plugins/simulator/fs9/fs9client.h b/src/plugins/simulator/fs9/fs9client.h
index 4968d34d8..569dd9745 100644
--- a/src/plugins/simulator/fs9/fs9client.h
+++ b/src/plugins/simulator/fs9/fs9client.h
@@ -77,11 +77,7 @@ namespace BlackSimPlugin
             virtual void cleanup() override;
 
         private:
-            /*!
-             * Enumerate all FS9 session hosts
-             * \todo Ideally host enumeration is required only once (if ever).
-             *       Move this into its own class with a static member host address.
-             */
+            //! Enumerate all FS9 session hosts
             HRESULT enumDirectPlayHosts();
 
             HRESULT createHostAddress();