diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
index 4b4548f8eb..6a0bc086d4 100644
--- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
+++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
@@ -34,7 +34,6 @@ object IdeVersions {
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
-                    "com.jetbrains.codeWithMe",
                 ),
                 marketplacePlugins = listOf(
                     "org.toml.lang:243.21565.122",
@@ -74,7 +73,6 @@ object IdeVersions {
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
-                    "com.jetbrains.codeWithMe",
                 ),
                 marketplacePlugins = listOf(
                     "org.toml.lang:251.26927.47",
@@ -121,7 +119,6 @@ object IdeVersions {
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
-                    "com.jetbrains.codeWithMe",
                     "com.intellij.properties"
                 ),
                 marketplacePlugins = listOf(
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
index 816cf9cd65..7239a8ed56 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
@@ -17,7 +17,6 @@ import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.options.ShowSettingsUtil
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.LocalFileSystem
-import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.ui.jcef.JBCefJSQuery.Response
 import kotlinx.coroutines.CancellationException
@@ -104,6 +103,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendC
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.StopResponseMessage
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TELEMETRY_EVENT
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
 import software.aws.toolkits.jetbrains.services.amazonq.util.command
 import software.aws.toolkits.jetbrains.services.amazonq.util.tabType
 import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.AmazonQTheme
@@ -232,10 +232,10 @@ class BrowserConnector(
             SEND_CHAT_COMMAND_PROMPT -> {
                 val requestFromUi = serializer.deserializeChatMessages<SendChatPromptRequest>(node)
                 val editor = FileEditorManager.getInstance(project).selectedTextEditor
-                val textDocumentIdentifier = editor?.virtualFile?.let { virtualFile ->
-                    val relativePath = VfsUtilCore.getRelativePath(virtualFile, project.baseDir)
-                        ?: virtualFile.path
-                    TextDocumentIdentifier(relativePath)
+                val textDocumentIdentifier = editor?.let { e ->
+                    e.virtualFile?.let {
+                        TextDocumentIdentifier(toUriString(it))
+                    }
                 }
                 val cursorState = editor?.let { LspEditorUtil.getCursorState(it) }
 
@@ -366,10 +366,10 @@ class BrowserConnector(
 
             CHAT_INSERT_TO_CURSOR -> {
                 val editor = FileEditorManager.getInstance(project).selectedTextEditor
-                val textDocumentIdentifier = editor?.virtualFile?.let { virtualFile ->
-                    val relativePath = VfsUtilCore.getRelativePath(virtualFile, project.baseDir)
-                        ?: virtualFile.path
-                    TextDocumentIdentifier(relativePath)
+                val textDocumentIdentifier = editor?.let { e ->
+                    e.virtualFile?.let {
+                        TextDocumentIdentifier(toUriString(it))
+                    }
                 }
                 val cursorPosition = editor?.let { LspEditorUtil.getCursorPosition(it) }
 
diff --git a/plugins/amazonq/shared/jetbrains-ultimate/src-253+/software/aws/toolkits/jetbrains/CwmProblemsViewMutator.kt b/plugins/amazonq/shared/jetbrains-ultimate/src-253+/software/aws/toolkits/jetbrains/CwmProblemsViewMutator.kt
deleted file mode 100644
index 3346352e7e..0000000000
--- a/plugins/amazonq/shared/jetbrains-ultimate/src-253+/software/aws/toolkits/jetbrains/CwmProblemsViewMutator.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-package software.aws.toolkits.jetbrains
-
-import com.intellij.analysis.problemsView.toolWindow.ProblemsView
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.wm.ToolWindow
-import com.jetbrains.rdserver.toolWindow.BackendToolWindowHost
-
-class CwmProblemsViewMutator : ProblemsViewMutator {
-    override fun mutateProblemsView(project: Project, runnable: (ToolWindow) -> Unit) {
-        BackendToolWindowHost.getAllInstances(project).forEach { host ->
-            host.getToolWindow(ProblemsView.ID)?.let {
-                runnable(it)
-            }
-        }
-    }
-}
diff --git a/plugins/amazonq/shared/jetbrains-community/src-242-252/software/aws/toolkits/jetbrains/CwmProblemsViewMutator.kt b/plugins/amazonq/shared/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/CwmProblemsViewMutator.kt
similarity index 100%
rename from plugins/amazonq/shared/jetbrains-community/src-242-252/software/aws/toolkits/jetbrains/CwmProblemsViewMutator.kt
rename to plugins/amazonq/shared/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/CwmProblemsViewMutator.kt