diff --git a/src/plugins/locator/locatormanager.cpp b/src/plugins/locator/locatormanager.cpp
index dc051b5796d..38a17dc270d 100644
--- a/src/plugins/locator/locatormanager.cpp
+++ b/src/plugins/locator/locatormanager.cpp
@@ -33,27 +33,26 @@
 #include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 
-using namespace Locator;
-using namespace Locator::Internal;
+namespace Locator {
 
-LocatorManager *LocatorManager::m_instance = 0;
+static Internal::LocatorWidget *m_locatorWidget = 0;
 
-LocatorManager::LocatorManager(LocatorWidget *locatorWidget)
-  : QObject(locatorWidget),
-    m_locatorWidget(locatorWidget)
+LocatorManager::LocatorManager(Internal::LocatorWidget *locatorWidget)
+  : QObject(locatorWidget)
 {
-    m_instance = this;
+    m_locatorWidget = locatorWidget;
 }
 
 LocatorManager::~LocatorManager()
 {
     ExtensionSystem::PluginManager::removeObject(this);
-    m_instance = 0;
 }
 
 void LocatorManager::show(const QString &text,
-                            int selectionStart, int selectionLength)
+                          int selectionStart, int selectionLength)
 {
     QTC_ASSERT(m_locatorWidget, return);
     m_locatorWidget->show(text, selectionStart, selectionLength);
 }
+
+} // namespace Internal
diff --git a/src/plugins/locator/locatormanager.h b/src/plugins/locator/locatormanager.h
index 2257dd6ffd9..53b1b8a392c 100644
--- a/src/plugins/locator/locatormanager.h
+++ b/src/plugins/locator/locatormanager.h
@@ -36,9 +36,7 @@
 
 namespace Locator {
 
-namespace Internal {
-class LocatorWidget;
-}
+namespace Internal { class LocatorWidget; }
 
 class LOCATOR_EXPORT LocatorManager : public QObject
 {
@@ -48,13 +46,7 @@ public:
     LocatorManager(Internal::LocatorWidget *locatorWidget);
     ~LocatorManager();
 
-    static LocatorManager *instance() { return m_instance; }
-
-    void show(const QString &text, int selectionStart = -1, int selectionLength = 0);
-
-private:
-    Internal::LocatorWidget *m_locatorWidget;
-    static LocatorManager *m_instance;
+    static void show(const QString &text, int selectionStart = -1, int selectionLength = 0);
 };
 
 } // namespace Locator
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index 69900bba9a7..d4172c12057 100644
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ b/src/plugins/texteditor/texteditoractionhandler.cpp
@@ -448,13 +448,11 @@ void TextEditorActionHandler::updateCopyAction()
 
 void TextEditorActionHandler::gotoAction()
 {
-    Locator::LocatorManager *locatorManager = Locator::LocatorManager::instance();
-    QTC_ASSERT(locatorManager, return);
     QString locatorString = TextEditorPlugin::instance()->lineNumberFilter()->shortcutString();
     locatorString += QLatin1Char(' ');
     const int selectionStart = locatorString.size();
     locatorString += tr("<line>:<column>");
-    locatorManager->show(locatorString, selectionStart, locatorString.size() - selectionStart);
+    Locator::LocatorManager::show(locatorString, selectionStart, locatorString.size() - selectionStart);
 }
 
 void TextEditorActionHandler::printAction()