diff --git a/src/cli/bg.ts b/src/cli/bg.ts
index 2f1125e7d..0e9181c18 100644
--- a/src/cli/bg.ts
+++ b/src/cli/bg.ts
@@ -336,6 +336,3 @@ export async function handleBgStart(args: string[]): Promise<void> {
     process.exitCode = 1
   }
 }
-
-// Legacy export alias — kept for backward compatibility with cli.tsx
-export const handleBgFlag = handleBgStart
diff --git a/src/commands/ultraplan.tsx b/src/commands/ultraplan.tsx
index 2a7e2ee85..ae5e53042 100644
--- a/src/commands/ultraplan.tsx
+++ b/src/commands/ultraplan.tsx
@@ -75,7 +75,6 @@ export function buildUltraplanPrompt(blurb: string, seedPlan?: string, promptId?
   if (seedPlan) {
     parts.push('Here is a draft plan to refine:', '', seedPlan, '');
   }
-  // parts.push(ULTRAPLAN_INSTRUCTIONS)
   parts.push(getPromptText(promptId!));
 
   if (blurb) {
@@ -341,8 +340,6 @@ async function launchDetached(opts: {
   // occurs after teleportToRemote succeeds (avoids 30min orphan).
   let sessionId: string | undefined;
   try {
-    // const model = getUltraplanModel()
-
     const eligibility = await checkRemoteAgentEligibility();
     if (!eligibility.eligible) {
       logEvent('tengu_ultraplan_create_failed', {
@@ -365,7 +362,6 @@ async function launchDetached(opts: {
     const session = await teleportToRemote({
       initialMessage: prompt,
       description: blurb || 'Refine local plan',
-      // model,
       permissionMode: 'plan',
       ultraplan: true,
       signal,
@@ -404,7 +400,6 @@ async function launchDetached(opts: {
     logEvent('tengu_ultraplan_launched', {
       has_seed_plan: Boolean(seedPlan),
       prompt_identifier: promptIdentifier as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      // model: model as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
     });
     // TODO(#23985): replace registerRemoteAgentTask + startDetachedPoll with
     // ExitPlanModeScanner inside startRemoteSessionPolling.
diff --git a/src/components/Onboarding.tsx b/src/components/Onboarding.tsx
index 2d0cf32ed..e60d21cd1 100644
--- a/src/components/Onboarding.tsx
+++ b/src/components/Onboarding.tsx
@@ -134,10 +134,6 @@ export function Onboarding({ onDone }: Props): React.ReactNode {
   }
 
   const steps: OnboardingStep[] = [];
-  // Preflight check disabled — users may use third-party API providers
-  // if (oauthEnabled) {
-  //   steps.push({ id: 'preflight', component: preflightStep })
-  // }
   steps.push({ id: 'theme', component: themeStep });
 
   if (apiKeyNeedingApproval) {
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 539126983..aa796c168 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -51,11 +51,6 @@ declare function ExperimentEnrollmentNotice(): JSX.Element | null
 // Hook timing threshold (re-exported from services/tools/toolExecution.ts)
 declare const HOOK_TIMING_DISPLAY_THRESHOLD_MS: number
 
-// Ultraplan (internal)
-// declare function UltraplanChoiceDialog(props: Record<string, unknown>): JSX.Element | null
-// declare function UltraplanLaunchDialog(props: Record<string, unknown>): JSX.Element | null
-// declare function launchUltraplan(...args: unknown[]): Promise<string>
-
 // T — Generic type parameter leaked from React compiler output
 // (react/compiler-runtime emits compiled JSX that loses generic type params)
 declare type T = unknown
diff --git a/src/types/hooks.ts b/src/types/hooks.ts
index 9f1ae3b73..d69d6d3b7 100644
--- a/src/types/hooks.ts
+++ b/src/types/hooks.ts
@@ -191,9 +191,6 @@ export function isAsyncHookJSONOutput(
 
 // Compile-time assertion that SDK and Zod types match
 // Disabled: decompilation type mismatch makes these types non-equal
-// import type { IsEqual } from 'type-fest'
-// type Assert<T extends true> = T
-// type _assertSDKTypesMatch = Assert<IsEqual<SchemaHookJSONOutput, HookJSONOutput>>
 
 /** Context passed to callback hooks for state access */
 export type HookCallbackContext = {
diff --git a/src/types/textInputTypes.ts b/src/types/textInputTypes.ts
index 26e2c29ed..487512882 100644
--- a/src/types/textInputTypes.ts
+++ b/src/types/textInputTypes.ts
@@ -91,11 +91,6 @@ export type BaseTextInputProps = {
    */
   readonly onExitMessage?: (show: boolean, key?: string) => void
 
-  /**
-   * Optional callback to show custom message
-   */
-  // readonly onMessage?: (show: boolean, message?: string) => void
-
   /**
    * Optional callback to reset history position
    */