diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts
index aa0918cc3d..9abddc6d96 100644
--- a/src/core/webview/ClineProvider.ts
+++ b/src/core/webview/ClineProvider.ts
@@ -2267,12 +2267,7 @@ export class ClineProvider
 			return
 		}
 
-		await ExtensionBridgeService.handleRemoteControlState(
-			userInfo,
-			enabled,
-			{ ...bridgeConfig, provider: this as any, sessionId: vscode.env.sessionId },
-			(message: string) => this.log(message),
-		)
+		const userInfo = CloudService.instance.getUserInfo()
 
 		if (!userInfo) {
 			this.log("[ClineProvider#remoteControlEnabled] Failed to get user info, disconnecting")
diff --git a/src/extension.ts b/src/extension.ts
index ad02b42781..dc96e282c4 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -191,29 +191,6 @@ export async function activate(context: vscode.ExtensionContext) {
 		)
 	}
 
-	const postStateListener = () => ClineProvider.getVisibleInstance()?.postStateToWebview()
-
-	cloudService.on("auth-state-changed", postStateListener)
-	cloudService.on("settings-updated", postStateListener)
-
-	cloudService.on("user-info", async ({ userInfo }) => {
-		postStateListener()
-
-		const bridgeConfig = await cloudService.cloudAPI?.bridgeConfig().catch(() => undefined)
-
-		if (!bridgeConfig) {
-			outputChannel.appendLine("[CloudService] Failed to get bridge config")
-			return
-		}
-
-		ExtensionBridgeService.handleRemoteControlState(
-			userInfo,
-			contextProxy.getValue("remoteControlEnabled"),
-			{ ...bridgeConfig, provider: provider as any, sessionId: vscode.env.sessionId },
-			(message: string) => outputChannel.appendLine(message),
-		)
-	})
-
 	// Add to subscriptions for proper cleanup on deactivate.
 	context.subscriptions.push(cloudService)
 
diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts
index 9ce2acb8f6..eb7f4864e6 100644
--- a/src/shared/ExtensionMessage.ts
+++ b/src/shared/ExtensionMessage.ts
@@ -10,6 +10,10 @@ import type {
 	MarketplaceItem,
 	TodoItem,
 	ModelInfo,
+	OrganizationAllowList,
+	CloudUserInfo,
+	ShareVisibility,
+	QueuedMessage,
 } from "@roo-code/types"
 
 import { GitCommit } from "../utils/git"