diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
index e3f15935479..cefc74135d8 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
@@ -31,9 +31,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.commands.MessageTypeRegi
 import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts.ArtifactManager
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AsyncChatUiListener
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommunicationManager
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.FlareUiMessage
 import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
 import software.aws.toolkits.jetbrains.services.amazonq.messages.MessageConnector
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
@@ -66,22 +64,6 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
     private val editorThemeAdapter = EditorThemeAdapter()
     private val appConnections = mutableListOf<AppConnection>()
 
-    init {
-        // will be removed in next iteration.
-        project.messageBus.connect().subscribe(
-            AsyncChatUiListener.TOPIC,
-            object : AsyncChatUiListener {
-                override fun onChange(command: String) {
-                    browser.get()?.postChat(command)
-                }
-
-                override fun onChange(command: FlareUiMessage) {
-                    browser.get()?.postChat(command)
-                }
-            }
-        )
-    }
-
     val component = panel {
         row {
             cell(webviewContainer)
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/HandleIssueCommandAction.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/HandleIssueCommandAction.kt
index 2e0fb0693f1..11254eef553 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/HandleIssueCommandAction.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/HandleIssueCommandAction.kt
@@ -81,7 +81,6 @@ class HandleIssueCommandAction : AnAction(), DumbAware {
 
                 val uiMessage = FlareUiMessage(SEND_TO_PROMPT, params)
                 ChatCommunicationManager.getInstance(project).notifyUi(uiMessage)
-//                AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
             }
         }
     }
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AsyncChatUiListener.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AsyncChatUiListener.kt
deleted file mode 100644
index 6b56199aa21..00000000000
--- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AsyncChatUiListener.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-package software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat
-
-import com.intellij.openapi.project.Project
-import com.intellij.util.messages.Topic
-import java.util.EventListener
-
-@Deprecated("Why are we using a message bus for this????????")
-interface AsyncChatUiListener : EventListener {
-    @Deprecated("shouldn't need this version")
-    fun onChange(command: String) {}
-
-    fun onChange(command: FlareUiMessage) {}
-
-    companion object {
-        @Topic.ProjectLevel
-        val TOPIC = Topic.create("Partial chat message provider", AsyncChatUiListener::class.java)
-
-        @Deprecated("Why are we using a message bus for this????????")
-        fun notifyPartialMessageUpdate(project: Project, command: FlareUiMessage) {
-            project.messageBus.syncPublisher(TOPIC).onChange(command)
-        }
-
-        // will be removed in next iteration.
-        @Deprecated("shouldn't need this version")
-        fun notifyPartialMessageUpdate(project: Project, command: String) {
-            project.messageBus.syncPublisher(TOPIC).onChange(command)
-        }
-    }
-}