diff --git a/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanelFactory.kt b/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanelFactory.kt
deleted file mode 100644
index 7fa75eff8ae4..000000000000
--- a/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanelFactory.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.openapi.wm.impl.status
-
-import com.intellij.openapi.wm.StatusBarWidget
-
-interface TogglePopupHintsPanelFactory {
-    fun create() : StatusBarWidget
-}
\ No newline at end of file
diff --git a/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanelFactoryImpl.kt b/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanelFactoryImpl.kt
deleted file mode 100644
index 6584ddc972b4..000000000000
--- a/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanelFactoryImpl.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.openapi.wm.impl.status
-
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.wm.StatusBarWidget
-
-class TogglePopupHintsPanelFactoryImpl(val project: Project) : TogglePopupHintsPanelFactory {
-    override fun create(): StatusBarWidget {
-        return TogglePopupHintsPanel(project)
-    }
-
-}
\ No newline at end of file
diff --git a/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanelProvider.kt b/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanelProvider.kt
index 8e39bcea6cdd..a5cac44627be 100644
--- a/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanelProvider.kt
+++ b/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanelProvider.kt
@@ -1,7 +1,6 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.openapi.wm.impl.status
 
-import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.StatusBar
 import com.intellij.openapi.wm.StatusBarWidget
@@ -9,7 +8,7 @@ import com.intellij.openapi.wm.StatusBarWidgetProvider
 
 class TogglePopupHintsPanelProvider : StatusBarWidgetProvider {
     override fun getWidget(project: Project): StatusBarWidget? {
-        return ServiceManager.getService(project, TogglePopupHintsPanelFactory::class.java).create()
+        return TogglePopupHintsPanel(project)
     }
 
     override fun getAnchor(): String {
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index 0c0ca9d35a54..f99ab5c7e3df 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -1254,9 +1254,6 @@
 
     <editorFactoryListener implementation="com.intellij.codeInsight.daemon.impl.EditorTracker$MyAppLevelEditorFactoryListener"/>
 
-    <projectService serviceInterface="com.intellij.openapi.wm.impl.status.TogglePopupHintsPanelFactory"
-                    serviceImplementation="com.intellij.openapi.wm.impl.status.TogglePopupHintsPanelFactoryImpl"/>
-
     <projectService serviceInterface="com.intellij.codeInsight.daemon.impl.HectorComponentFactory"
                     serviceImplementation="com.intellij.codeInsight.daemon.impl.HectorComponentFactoryImpl"/>
   </extensions>