diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/outputs/NotebookOutputInlayController.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/outputs/NotebookOutputInlayController.kt
index 2d1cfe4bbf21..b97aea3aa3e7 100644
--- a/notebooks/visualization/src/com/intellij/notebooks/visualization/outputs/NotebookOutputInlayController.kt
+++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/outputs/NotebookOutputInlayController.kt
@@ -1,25 +1,14 @@
 package com.intellij.notebooks.visualization.outputs
 
+import com.intellij.notebooks.visualization.outputs.impl.SurroundingComponent
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.thisLogger
-import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.EditorCustomElementRenderer
 import com.intellij.util.asSafely
-import com.intellij.util.messages.Topic
-import com.intellij.notebooks.visualization.outputs.impl.SurroundingComponent
 import javax.swing.JComponent
 
-// ToDo: merge with NotebookOutputListener
-interface OutputListener {
-  fun beforeOutputCreated(editor: Editor, line: Int) {}
-  fun outputCreated(editor: Editor, line: Int) {}
-  fun outputSizeUpdated(editor: Editor, line: Int?) {}
-}
-
-val OUTPUT_LISTENER: Topic<OutputListener> = Topic.create("OutputAdded", OutputListener::class.java)
-
 val EditorCustomElementRenderer.notebookInlayOutputComponent: JComponent?
   get() = asSafely<JComponent>()?.components?.firstOrNull()?.asSafely<SurroundingComponent>()
 
diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/EditorCellOutputs.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/EditorCellOutputs.kt
index 34352493b5bd..ddaa9a763e69 100644
--- a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/EditorCellOutputs.kt
+++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/EditorCellOutputs.kt
@@ -8,7 +8,6 @@ import com.intellij.notebooks.visualization.outputs.NotebookOutputComponentFacto
 import com.intellij.notebooks.visualization.outputs.NotebookOutputComponentFactory.Companion.gutterPainter
 import com.intellij.notebooks.visualization.outputs.NotebookOutputComponentFactoryGetter
 import com.intellij.notebooks.visualization.outputs.NotebookOutputDataKey
-import com.intellij.notebooks.visualization.outputs.OUTPUT_LISTENER
 import com.intellij.notebooks.visualization.outputs.impl.CollapsingComponent
 import com.intellij.notebooks.visualization.outputs.impl.InnerComponent
 import com.intellij.notebooks.visualization.outputs.impl.SurroundingComponent
@@ -65,7 +64,7 @@ class EditorCellOutputs(
   }
 
   private val outerComponent = SurroundingComponent.create(editor, innerComponent).also {
-    DataManager.registerDataProvider(it, NotebookCellDataProvider(editor, it, { cell.interval }))
+    DataManager.registerDataProvider(it, NotebookCellDataProvider(editor, it) { cell.interval })
   }
 
   internal var inlay: Inlay<*>? = null
@@ -190,8 +189,6 @@ class EditorCellOutputs(
     factory: NotebookOutputComponentFactory<*, K>,
     outputDataKey: K,
   ): NotebookOutputComponentFactory.CreatedComponent<*>? {
-    val lines = cell.interval.lines
-    ApplicationManager.getApplication().messageBus.syncPublisher(OUTPUT_LISTENER).beforeOutputCreated(editor, lines.last)
     val result = try {
       factory.createComponent(editor, outputDataKey)
     }
@@ -210,7 +207,6 @@ class EditorCellOutputs(
         Disposer.register(editor.disposable, disposable)
       }
     }
-    ApplicationManager.getApplication().messageBus.syncPublisher(OUTPUT_LISTENER).outputCreated(editor, lines.last)
     return result
   }