diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 440ef6bfe8ae3f4fc2688d23921dc9ff7771c7a7..4c44ac87235d4f3dc12f8c4d013d198ac9348d9c 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -419,24 +419,11 @@ struct TestCallBack
 Q_DECLARE_METATYPE(Debugger::Internal::BreakpointMenuContextData)
 Q_DECLARE_METATYPE(Debugger::Internal::TestCallBack)
 
-
 namespace Debugger {
 namespace Internal {
 
-// FIXME: Outdated?
-// The createCdbEngine function takes a list of options pages it can add to.
-// This allows for having a "enabled" toggle on the page independently
-// of the engine. That's good for not enabling the related ActiveX control
-// unnecessarily.
-
 void addCdbOptionPages(QList<IOptionsPage*> *opts);
 void addGdbOptionPages(QList<IOptionsPage*> *opts);
-void addScriptOptionPages(QList<IOptionsPage*> *opts);
-void addTcfOptionPages(QList<IOptionsPage*> *opts);
-
-#ifdef WITH_LLDB
-void addLldbOptionPages(QList<IOptionsPage*> *opts);
-#endif
 
 static QToolButton *toolButton(QAction *action)
 {
@@ -642,7 +629,6 @@ public:
     }
     DebuggerRunControl *attachToRunningProcess(Kit *kit, DeviceProcessItem process);
 
-public slots:
     void writeSettings()
     {
         m_debuggerSettings->writeSettings();
@@ -779,7 +765,7 @@ public slots:
     void attachToFoundProcess();
     void continueOnAttach(Debugger::DebuggerState state);
     void attachToQmlPort();
-    void runScheduled();
+    Q_SLOT void runScheduled();
     void attachCore();
 
     void enableReverseDebuggingTriggered(const QVariant &value);
@@ -3060,9 +3046,6 @@ void DebuggerPluginPrivate::extensionsInitialized()
     addLldbOptionPages(&engineOptionPages);
 #endif
 
-    // addScriptOptionPages(&engineOptionPages);
-    // addTcfOptionPages(&engineOptionPages);
-
     foreach (IOptionsPage *op, engineOptionPages)
         m_plugin->addAutoReleasedObject(op);
     m_plugin->addAutoReleasedObject(new LocalsAndExpressionsOptionsPage);