diff --git a/src/components/dialog/content/TopUpCreditsDialogContentLegacy.test.ts b/src/components/dialog/content/TopUpCreditsDialogContentLegacy.test.ts
index 22ab1dbeb56..65d094e06ce 100644
--- a/src/components/dialog/content/TopUpCreditsDialogContentLegacy.test.ts
+++ b/src/components/dialog/content/TopUpCreditsDialogContentLegacy.test.ts
@@ -129,7 +129,7 @@ describe('TopUpCreditsDialogContentLegacy', () => {
     mockShouldUseWorkspaceBilling.value = false
   })
 
-  it('shows the subscription settings panel after a successful purchase', async () => {
+  it('shows Plan & Credits after a successful Cloud purchase', async () => {
     mockPurchaseCreditsDirect.mockResolvedValue(undefined)
 
     renderDialog()
@@ -137,7 +137,7 @@ describe('TopUpCreditsDialogContentLegacy', () => {
 
     expect(mockPurchaseCreditsDirect).toHaveBeenCalledWith(50)
     expect(mockCloseDialog).toHaveBeenCalled()
-    expect(mockShowSettings).toHaveBeenCalledWith('subscription')
+    expect(mockShowSettings).toHaveBeenCalledWith('workspace')
   })
 
   it('shows the credits settings panel when subscriptions are disabled', async () => {
diff --git a/src/components/dialog/content/TopUpCreditsDialogContentLegacy.vue b/src/components/dialog/content/TopUpCreditsDialogContentLegacy.vue
index 0ea0eee7389..09afde5d0b4 100644
--- a/src/components/dialog/content/TopUpCreditsDialogContentLegacy.vue
+++ b/src/components/dialog/content/TopUpCreditsDialogContentLegacy.vue
@@ -261,12 +261,9 @@ async function handleBuy() {
     // Close top-up dialog (keep tracking) and open credits panel to show updated balance
     handleClose(false)
 
-    // On the consolidated (workspace) billing flow, show the workspace settings
-    // panel; otherwise show the legacy subscription/credits panel.
-    const settingsPanel = shouldUseWorkspaceBilling.value
-      ? 'workspace'
-      : isSubscriptionEnabled()
-        ? 'subscription'
+    const settingsPanel =
+      shouldUseWorkspaceBilling.value || isSubscriptionEnabled()
+        ? 'workspace'
         : 'credits'
     settingsDialog.show(settingsPanel)
   } catch (error) {
diff --git a/src/components/topbar/CurrentUserPopoverLegacy.test.ts b/src/components/topbar/CurrentUserPopoverLegacy.test.ts
index a03764d2e0f..880264921e0 100644
--- a/src/components/topbar/CurrentUserPopoverLegacy.test.ts
+++ b/src/components/topbar/CurrentUserPopoverLegacy.test.ts
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/vue'
 import userEvent from '@testing-library/user-event'
 import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
-import { defineComponent, h, ref } from 'vue'
+import { h, ref } from 'vue'
 import { createI18n } from 'vue-i18n'
 
 import { formatCreditsFromCents } from '@/base/credits/comfyCredits'
@@ -62,10 +62,8 @@ function makeSubscription(
   }
 }
 
-const mockFetchStatus = vi.fn().mockResolvedValue(undefined)
 const mockFetchBalance = vi.fn().mockResolvedValue(undefined)
 const mockCanAccessSubscriptionFeatures = ref(true)
-const mockIsFreeTier = ref(false)
 const mockTier = ref<SubscriptionInfo['tier']>('CREATOR')
 const mockSubscription = ref<SubscriptionInfo | null>(makeSubscription())
 const mockBalance = ref<BalanceInfo | null>(null)
@@ -74,28 +72,14 @@ const mockIsLoading = ref(false)
 vi.mock('@/composables/billing/useBillingContext', () => ({
   useBillingContext: vi.fn(() => ({
     canAccessSubscriptionFeatures: mockCanAccessSubscriptionFeatures,
-    isFreeTier: mockIsFreeTier,
     tier: mockTier,
     subscription: mockSubscription,
     balance: mockBalance,
     isLoading: mockIsLoading,
-    fetchStatus: mockFetchStatus,
     fetchBalance: mockFetchBalance
   }))
 }))
 
-const mockShowPricingTable = vi.fn()
-vi.mock(
-  '@/platform/cloud/subscription/composables/useSubscriptionDialog',
-  () => ({
-    useSubscriptionDialog: vi.fn(() => ({
-      show: vi.fn(),
-      showPricingTable: mockShowPricingTable,
-      hide: vi.fn()
-    }))
-  })
-)
-
 vi.mock('@/components/common/UserAvatar.vue', () => ({
   default: {
     name: 'UserAvatarMock',
@@ -124,36 +108,9 @@ vi.mock('@/platform/telemetry', () => ({
   }))
 }))
 
-const mockIsCloud = vi.hoisted(() => ({ value: true }))
-vi.mock('@/platform/distribution/types', () => ({
-  get isCloud() {
-    return mockIsCloud.value
-  }
-}))
-
-vi.mock('@/platform/cloud/subscription/components/SubscribeButton.vue', () => ({
-  default: defineComponent({
-    name: 'SubscribeButtonMock',
-    emits: ['subscribed'],
-    setup(_, { emit }) {
-      return () =>
-        h(
-          'button',
-          {
-            'data-testid': 'subscribe-button-mock',
-            onClick: () => emit('subscribed')
-          },
-          'Subscribe Button'
-        )
-    }
-  })
-}))
-
 describe('CurrentUserPopoverLegacy', () => {
   beforeEach(() => {
-    mockIsCloud.value = true
     mockCanAccessSubscriptionFeatures.value = true
-    mockIsFreeTier.value = false
     mockTier.value = 'CREATOR'
     mockSubscription.value = makeSubscription()
     mockBalance.value = {
@@ -201,15 +158,6 @@ describe('CurrentUserPopoverLegacy', () => {
     expect(mockFetchBalance).toHaveBeenCalled()
   })
 
-  it('refreshes subscription status through the billing facade after subscribing', async () => {
-    mockCanAccessSubscriptionFeatures.value = false
-    const { user } = renderComponent()
-
-    await user.click(screen.getByTestId('subscribe-button-mock'))
-
-    expect(mockFetchStatus).toHaveBeenCalled()
-  })
-
   describe('subscription tier badge', () => {
     it('renders the tier name derived from the facade tier', () => {
       renderComponent()
@@ -326,26 +274,15 @@ describe('CurrentUserPopoverLegacy', () => {
     expect(onClose).toHaveBeenCalledTimes(1)
   })
 
-  it('opens subscription dialog and emits close event when plans & pricing item is clicked', async () => {
-    const { user, onClose } = renderComponent()
-
-    expect(screen.getByTestId('plans-pricing-menu-item')).toBeInTheDocument()
-
-    await user.click(screen.getByTestId('plans-pricing-menu-item'))
-
-    expect(mockShowPricingTable).toHaveBeenCalled()
-    expect(onClose).toHaveBeenCalledTimes(1)
-  })
-
-  it('offers plan management on cloud', async () => {
+  it('opens credits settings from the legacy account menu', async () => {
     const { user, onClose } = renderComponent()
 
     const menuItem = screen.getByTestId('manage-plan-menu-item')
-    expect(menuItem).toHaveTextContent(enMessages.subscription.managePlan)
+    expect(menuItem).toHaveTextContent(enMessages.credits.credits)
 
     await user.click(menuItem)
 
-    expect(mockShowSettingsDialog).toHaveBeenCalledWith('subscription')
+    expect(mockShowSettingsDialog).toHaveBeenCalledWith('credits')
     expect(onClose).toHaveBeenCalledTimes(1)
   })
 
@@ -445,90 +382,4 @@ describe('CurrentUserPopoverLegacy', () => {
       expect(screen.getByText('0')).toBeInTheDocument()
     })
   })
-
-  describe('cloud free tier', () => {
-    beforeEach(() => {
-      mockIsCloud.value = true
-      mockIsFreeTier.value = true
-    })
-
-    it('shows upgrade-to-add-credits button and hides add-credits button', () => {
-      renderComponent()
-      expect(
-        screen.getByTestId('upgrade-to-add-credits-button')
-      ).toBeInTheDocument()
-      expect(screen.queryByTestId('add-credits-button')).not.toBeInTheDocument()
-    })
-  })
-
-  describe('non-cloud distribution', () => {
-    beforeEach(() => {
-      mockIsCloud.value = false
-    })
-
-    it('still shows credits balance', () => {
-      renderComponent()
-      expect(screen.getByText('1000')).toBeInTheDocument()
-    })
-
-    it('shows add-credits button and hides upgrade-to-add-credits button', () => {
-      renderComponent()
-      expect(screen.getByTestId('add-credits-button')).toBeInTheDocument()
-      expect(
-        screen.queryByTestId('upgrade-to-add-credits-button')
-      ).not.toBeInTheDocument()
-    })
-
-    it('hides upgrade-to-add-credits button even when on free tier', () => {
-      mockIsFreeTier.value = true
-      renderComponent()
-      expect(screen.getByTestId('add-credits-button')).toBeInTheDocument()
-      expect(
-        screen.queryByTestId('upgrade-to-add-credits-button')
-      ).not.toBeInTheDocument()
-    })
-
-    it('hides subscribe button', () => {
-      mockCanAccessSubscriptionFeatures.value = false
-      renderComponent()
-      expect(
-        screen.queryByTestId('subscribe-button-mock')
-      ).not.toBeInTheDocument()
-    })
-
-    it('still shows partner nodes menu item', () => {
-      renderComponent()
-      expect(screen.getByTestId('partner-nodes-menu-item')).toBeInTheDocument()
-    })
-
-    it('hides plans & pricing menu item', () => {
-      renderComponent()
-      expect(
-        screen.queryByTestId('plans-pricing-menu-item')
-      ).not.toBeInTheDocument()
-    })
-
-    it('offers credits and opens the credits panel', async () => {
-      const { user, onClose } = renderComponent()
-
-      const menuItem = screen.getByTestId('manage-plan-menu-item')
-      expect(menuItem).toHaveTextContent(enMessages.credits.credits)
-      expect(menuItem).not.toHaveTextContent(enMessages.subscription.managePlan)
-
-      await user.click(menuItem)
-
-      expect(mockShowSettingsDialog).toHaveBeenCalledWith('credits')
-      expect(onClose).toHaveBeenCalledTimes(1)
-    })
-
-    it('still shows user settings menu item', () => {
-      renderComponent()
-      expect(screen.getByTestId('user-settings-menu-item')).toBeInTheDocument()
-    })
-
-    it('still shows logout menu item', () => {
-      renderComponent()
-      expect(screen.getByTestId('logout-menu-item')).toBeInTheDocument()
-    })
-  })
 })
diff --git a/src/components/topbar/CurrentUserPopoverLegacy.vue b/src/components/topbar/CurrentUserPopoverLegacy.vue
index fe66148650b..cfa3195738d 100644
--- a/src/components/topbar/CurrentUserPopoverLegacy.vue
+++ b/src/components/topbar/CurrentUserPopoverLegacy.vue
@@ -51,16 +51,6 @@
         <i class="icon-[lucide--circle-help]" />
       </Button>
       <Button
-        v-if="isCloud && isFreeTier"
-        variant="subscribe"
-        size="sm"
-        data-testid="upgrade-to-add-credits-button"
-        @click="handleUpgradeToAddCredits"
-      >
-        {{ $t('subscription.upgradeToAddCredits') }}
-      </Button>
-      <Button
-        v-else
         variant="secondary"
         size="sm"
         class="text-base-foreground"
@@ -71,16 +61,6 @@
       </Button>
     </div>
 
-    <div v-else-if="isCloud" class="flex justify-center px-4">
-      <SubscribeButton
-        :fluid="false"
-        :label="$t('subscription.subscribeToComfyCloud')"
-        size="sm"
-        button-variant="subscribe"
-        @subscribed="handleSubscribed"
-      />
-    </div>
-
     <Divider class="mx-0 my-2" />
 
     <div
@@ -95,40 +75,15 @@
       }}</span>
     </div>
 
-    <div
-      v-if="isCloud"
-      class="flex cursor-pointer items-center gap-2 px-4 py-2 hover:bg-secondary-background-hover"
-      data-testid="plans-pricing-menu-item"
-      @click="handleOpenPlansAndPricing"
-    >
-      <i class="icon-[lucide--receipt-text] text-sm text-muted-foreground" />
-      <span class="flex-1 text-sm text-base-foreground">{{
-        $t('subscription.plansAndPricing')
-      }}</span>
-      <span
-        v-if="canUpgrade"
-        class="rounded-full bg-base-foreground px-1.5 py-0.5 text-xs font-bold text-base-background"
-      >
-        {{ $t('subscription.upgrade') }}
-      </span>
-    </div>
-
     <div
       v-if="canAccessSubscriptionFeatures"
       class="flex cursor-pointer items-center gap-2 px-4 py-2 hover:bg-secondary-background-hover"
       data-testid="manage-plan-menu-item"
       @click="handleOpenPlanAndCreditsSettings"
     >
-      <i
-        :class="
-          cn(
-            'size-4 text-muted-foreground',
-            isCloud ? 'icon-[lucide--credit-card]' : 'icon-[lucide--coins]'
-          )
-        "
-      />
+      <i class="icon-[lucide--coins] size-4 text-muted-foreground" />
       <span class="flex-1 text-sm text-base-foreground">{{
-        planAndCreditsLabel
+        $t('credits.credits')
       }}</span>
     </div>
 
@@ -159,7 +114,6 @@
 </template>
 
 <script setup lang="ts">
-import { cn } from '@comfyorg/tailwind-utils'
 import Divider from 'primevue/divider'
 import Skeleton from 'primevue/skeleton'
 import { computed, onMounted } from 'vue'
@@ -171,9 +125,6 @@ import Button from '@/components/ui/button/Button.vue'
 import { useCurrentUser } from '@/composables/auth/useCurrentUser'
 import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { useExternalLink } from '@/composables/useExternalLink'
-import SubscribeButton from '@/platform/cloud/subscription/components/SubscribeButton.vue'
-import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
-import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
 import { useWorkspaceTierLabel } from '@/platform/workspace/composables/useWorkspaceTierLabel'
@@ -191,17 +142,14 @@ const settingsDialog = useSettingsDialog()
 const dialogService = useDialogService()
 const {
   canAccessSubscriptionFeatures,
-  isFreeTier,
   tier,
   subscription,
   balance,
   isLoading,
-  fetchStatus,
   fetchBalance
 } = useBillingContext()
 const { formatTierName } = useWorkspaceTierLabel()
-const subscriptionDialog = useSubscriptionDialog()
-const { locale, t } = useI18n()
+const { locale } = useI18n()
 
 const subscriptionTierName = computed(() =>
   formatTierName(tier.value, subscription.value?.duration === 'ANNUAL')
@@ -220,37 +168,13 @@ const formattedBalance = computed(() => {
   })
 })
 
-const canUpgrade = computed(() => {
-  const currentTier = tier.value
-  return (
-    currentTier === 'FREE' ||
-    currentTier === 'FOUNDERS_EDITION' ||
-    currentTier === 'STANDARD' ||
-    currentTier === 'CREATOR'
-  )
-})
-
-const planAndCreditsLabel = computed(() =>
-  isCloud ? t('subscription.managePlan') : t('credits.credits')
-)
-
 const handleOpenUserSettings = () => {
   settingsDialog.show('user')
   emit('close')
 }
 
-const handleOpenPlansAndPricing = () => {
-  subscriptionDialog.showPricingTable({ reason: 'avatar_menu_plans' })
-  emit('close')
-}
-
 const handleOpenPlanAndCreditsSettings = () => {
-  if (isCloud) {
-    settingsDialog.show('subscription')
-  } else {
-    settingsDialog.show('credits')
-  }
-
+  settingsDialog.show('credits')
   emit('close')
 }
 
@@ -268,20 +192,11 @@ const handleOpenPartnerNodesInfo = () => {
   emit('close')
 }
 
-const handleUpgradeToAddCredits = () => {
-  subscriptionDialog.showPricingTable({ reason: 'upgrade_to_add_credits' })
-  emit('close')
-}
-
 const handleLogout = async () => {
   await handleSignOut()
   emit('close')
 }
 
-const handleSubscribed = async () => {
-  await fetchStatus()
-}
-
 onMounted(() => {
   void fetchBalance()
 })
diff --git a/src/platform/cloud/subscription/components/SubscriptionPanel.test.ts b/src/platform/cloud/subscription/components/SubscriptionPanel.test.ts
deleted file mode 100644
index 4ef65965293..00000000000
--- a/src/platform/cloud/subscription/components/SubscriptionPanel.test.ts
+++ /dev/null
@@ -1,323 +0,0 @@
-import { createTestingPinia } from '@pinia/testing'
-import { render, screen } from '@testing-library/vue'
-import userEvent from '@testing-library/user-event'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { computed, ref } from 'vue'
-import { createI18n } from 'vue-i18n'
-
-import SubscriptionPanel from '@/platform/cloud/subscription/components/SubscriptionPanel.vue'
-
-// Mock state refs that can be modified between tests
-const mockCanAccessSubscriptionFeatures = ref(false)
-const mockIsCancelled = ref(false)
-const mockSubscriptionTier = ref<
-  'STANDARD' | 'CREATOR' | 'PRO' | 'FOUNDERS_EDITION' | null
->('CREATOR')
-const mockIsYearlySubscription = ref(false)
-
-const TIER_TO_NAME: Record<string, string> = {
-  STANDARD: 'Standard',
-  CREATOR: 'Creator',
-  PRO: 'Pro',
-  FOUNDERS_EDITION: "Founder's Edition"
-}
-
-// Mock composables - using computed to match composable return types
-const mockSubscriptionData = {
-  canAccessSubscriptionFeatures: computed(
-    () => mockCanAccessSubscriptionFeatures.value
-  ),
-  isCancelled: computed(() => mockIsCancelled.value),
-  formattedRenewalDate: computed(() => '2024-12-31'),
-  formattedEndDate: computed(() => '2024-12-31'),
-  subscriptionTier: computed(() => mockSubscriptionTier.value),
-  subscriptionTierName: computed(() => {
-    if (!mockSubscriptionTier.value) return ''
-    const baseName = TIER_TO_NAME[mockSubscriptionTier.value]
-    return mockIsYearlySubscription.value ? `${baseName} Yearly` : baseName
-  }),
-  subscriptionStatus: computed(() => ({
-    renewal_date: '2024-12-31T00:00:00Z'
-  })),
-  isYearlySubscription: computed(() => mockIsYearlySubscription.value),
-  handleInvoiceHistory: vi.fn()
-}
-
-const mockCreditsData = {
-  totalCredits: '10.00 Credits',
-  monthlyBonusCredits: '5.00 Credits',
-  prepaidCredits: '5.00 Credits',
-  isLoadingBalance: false
-}
-
-const mockActionsData = {
-  isLoadingSupport: false,
-  handleAddApiCredits: vi.fn(),
-  handleMessageSupport: vi.fn(),
-  handleRefresh: vi.fn(),
-  handleLearnMoreClick: vi.fn()
-}
-
-vi.mock('@/platform/cloud/subscription/composables/useSubscription', () => ({
-  useSubscription: () => mockSubscriptionData
-}))
-
-vi.mock(
-  '@/platform/cloud/subscription/composables/useSubscriptionCredits',
-  () => ({
-    useSubscriptionCredits: () => mockCreditsData
-  })
-)
-
-vi.mock(
-  '@/platform/cloud/subscription/composables/useSubscriptionActions',
-  () => ({
-    useSubscriptionActions: () => mockActionsData
-  })
-)
-
-vi.mock(
-  '@/platform/cloud/subscription/composables/useSubscriptionDialog',
-  () => ({
-    useSubscriptionDialog: () => ({
-      show: vi.fn()
-    })
-  })
-)
-
-vi.mock('@/composables/auth/useAuthActions', () => ({
-  useAuthActions: vi.fn(() => ({
-    authActions: vi.fn(() => ({
-      accessBillingPortal: vi.fn()
-    }))
-  }))
-}))
-
-vi.mock('@/composables/billing/useBillingContext', () => ({
-  useBillingContext: () => ({
-    canAccessSubscriptionFeatures: computed(
-      () => mockCanAccessSubscriptionFeatures.value
-    ),
-    manageSubscription: vi.fn()
-  })
-}))
-
-// Create i18n instance for testing
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  escapeParameter: true,
-  messages: {
-    en: {
-      subscription: {
-        title: 'Subscription',
-        titleUnsubscribed: 'Subscribe',
-        perMonth: '/ month',
-        subscribeNow: 'Subscribe Now',
-        manageSubscription: 'Manage Subscription',
-        partnerNodesBalance: 'Partner Nodes Balance',
-        partnerNodesDescription: 'Credits for partner nodes',
-        totalCredits: 'Total Credits',
-        creditsRemainingThisMonth: 'Included (Refills {date})',
-        creditsRemainingThisYear: 'Included (Refills {date})',
-        creditsYouveAdded: "Credits you've added",
-        monthlyBonusDescription: 'Monthly bonus',
-        prepaidDescription: 'Prepaid credits',
-        monthlyCreditsRollover: 'Monthly credits rollover info',
-        prepaidCreditsInfo: 'Prepaid credits info',
-        viewUsageHistory: 'View Usage History',
-        addCredits: 'Add Credits',
-        yourPlanIncludes: 'Your plan includes',
-        viewMoreDetailsPlans: 'View more details about plans & pricing',
-        learnMore: 'Learn More',
-        messageSupport: 'Message Support',
-        refreshCredits: 'Refresh credits',
-        invoiceHistory: 'Invoice History',
-        partnerNodesCredits: 'Partner nodes pricing',
-        renewsDate: 'Renews {date}',
-        expiresDate: 'Expires {date}',
-        monthlyCreditsLabel: 'monthly credits',
-        maxDurationLabel: 'max run duration',
-        maxDuration: {
-          free: '5 min',
-          standard: '30 min',
-          creator: '30 min',
-          pro: '1 hr',
-          founder: '30 min'
-        },
-        gpuLabel: 'RTX 6000 Pro (96GB VRAM)',
-        addCreditsLabel: 'Add more credits whenever',
-        customLoRAsLabel: 'Import your own LoRAs',
-        tiers: {
-          founder: {
-            name: "Founder's Edition",
-            price: '20.00',
-            benefits: {
-              monthlyCredits: '5,460',
-              monthlyCreditsLabel: 'monthly credits',
-              maxDuration: '30 min',
-              maxDurationLabel: 'max duration of each workflow run',
-              gpuLabel: 'RTX 6000 Pro (96GB VRAM)',
-              addCreditsLabel: 'Add more credits whenever',
-              customLoRAsLabel: 'Import your own LoRAs'
-            }
-          },
-          standard: {
-            name: 'Standard',
-            price: '20.00',
-            benefits: {
-              monthlyCredits: '4,200',
-              monthlyCreditsLabel: 'monthly credits',
-              maxDuration: '30 min',
-              maxDurationLabel: 'max duration of each workflow run',
-              gpuLabel: 'RTX 6000 Pro (96GB VRAM)',
-              addCreditsLabel: 'Add more credits whenever',
-              customLoRAsLabel: 'Import your own LoRAs'
-            }
-          },
-          creator: {
-            name: 'Creator',
-            price: '35.00',
-            benefits: {
-              monthlyCredits: '7,400',
-              monthlyCreditsLabel: 'monthly credits',
-              maxDuration: '30 min',
-              maxDurationLabel: 'max duration of each workflow run',
-              gpuLabel: 'RTX 6000 Pro (96GB VRAM)',
-              addCreditsLabel: 'Add more credits whenever',
-              customLoRAsLabel: 'Import your own LoRAs'
-            }
-          },
-          pro: {
-            name: 'Pro',
-            price: '100.00',
-            benefits: {
-              monthlyCredits: '21,100',
-              monthlyCreditsLabel: 'monthly credits',
-              maxDuration: '1 hr',
-              maxDurationLabel: 'max duration of each workflow run',
-              gpuLabel: 'RTX 6000 Pro (96GB VRAM)',
-              addCreditsLabel: 'Add more credits whenever',
-              customLoRAsLabel: 'Import your own LoRAs'
-            }
-          }
-        }
-      }
-    }
-  }
-})
-
-function createComponent(overrides = {}) {
-  return render(SubscriptionPanel, {
-    global: {
-      plugins: [createTestingPinia({ createSpy: vi.fn }), i18n],
-
-      stubs: {
-        CloudBadge: true,
-        SubscribeButton: true,
-        SubscriptionBenefits: true,
-        CreditsTile: true,
-        Button: {
-          template:
-            '<button v-bind="$attrs" @click="$emit(\'click\')" :disabled="loading" :data-testid="label" :data-icon="icon"><slot/></button>',
-          props: ['variant', 'size', 'loading', 'label', 'icon'],
-          emits: ['click']
-        },
-        Skeleton: {
-          template: '<div role="status" aria-label="Loading"></div>'
-        }
-      }
-    },
-    ...overrides
-  })
-}
-
-function findButtonByText(text: string) {
-  const button = screen
-    .getAllByRole('button')
-    .find((b) => b.textContent?.includes(text))
-  if (!button) throw new Error(`Button with text "${text}" not found`)
-  return button
-}
-
-describe('SubscriptionPanel', () => {
-  beforeEach(() => {
-    // Reset mock state
-    mockCanAccessSubscriptionFeatures.value = false
-    mockIsCancelled.value = false
-    mockSubscriptionTier.value = 'CREATOR'
-    mockIsYearlySubscription.value = false
-    mockCreditsData.isLoadingBalance = false
-    mockActionsData.isLoadingSupport = false
-  })
-
-  describe('subscription state functionality', () => {
-    it('shows correct UI for active subscription', () => {
-      mockCanAccessSubscriptionFeatures.value = true
-      const { container } = createComponent()
-      expect(container.textContent).toContain('Manage Subscription')
-    })
-
-    it('shows correct UI for inactive subscription', () => {
-      mockCanAccessSubscriptionFeatures.value = false
-      const { container } = createComponent()
-      // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
-      expect(container.querySelector('subscribe-button-stub')).not.toBeNull()
-      expect(container.textContent).not.toContain('Manage Subscription')
-    })
-
-    it('shows renewal date for active non-cancelled subscription', () => {
-      mockCanAccessSubscriptionFeatures.value = true
-      mockIsCancelled.value = false
-      const { container } = createComponent()
-      expect(container.textContent).toContain('Renews 2024-12-31')
-    })
-
-    it('shows expiry date for cancelled subscription', () => {
-      mockCanAccessSubscriptionFeatures.value = true
-      mockIsCancelled.value = true
-      const { container } = createComponent()
-      expect(container.textContent).toContain('Expires 2024-12-31')
-    })
-
-    it('displays FOUNDERS_EDITION tier without the custom-LoRA perk', () => {
-      mockSubscriptionTier.value = 'FOUNDERS_EDITION'
-      const { container } = createComponent()
-      expect(container.textContent).toContain("Founder's Edition")
-      expect(container.textContent).toContain('RTX 6000 Pro (96GB VRAM)')
-      expect(container.textContent).not.toContain('Import your own LoRAs')
-    })
-
-    it('displays CREATOR tier with the custom-LoRA perk', () => {
-      mockSubscriptionTier.value = 'CREATOR'
-      const { container } = createComponent()
-      expect(container.textContent).toContain('Creator')
-      expect(container.textContent).toContain('Import your own LoRAs')
-    })
-  })
-
-  describe('action buttons', () => {
-    it('should call handleLearnMoreClick when learn more is clicked', async () => {
-      createComponent()
-      const learnMoreButton = findButtonByText('Learn More')
-      await userEvent.click(learnMoreButton)
-      expect(mockActionsData.handleLearnMoreClick).toHaveBeenCalledOnce()
-    })
-
-    it('should call handleMessageSupport when message support is clicked', async () => {
-      createComponent()
-      const supportButton = findButtonByText('Message Support')
-      await userEvent.click(supportButton)
-      expect(mockActionsData.handleMessageSupport).toHaveBeenCalledOnce()
-    })
-  })
-
-  describe('loading states', () => {
-    it('should show loading state on support button when loading', () => {
-      mockActionsData.isLoadingSupport = true
-      createComponent()
-      const supportButton = findButtonByText('Message Support')
-      expect(supportButton).toBeDisabled()
-    })
-  })
-})
diff --git a/src/platform/cloud/subscription/components/SubscriptionPanel.vue b/src/platform/cloud/subscription/components/SubscriptionPanel.vue
deleted file mode 100644
index ffe2c177f88..00000000000
--- a/src/platform/cloud/subscription/components/SubscriptionPanel.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-  <div class="subscription-container h-full">
-    <div class="flex h-full flex-col gap-6">
-      <div class="flex items-center gap-2">
-        <span class="font-inter text-2xl/tight font-semibold">
-          {{
-            canAccessSubscriptionFeatures
-              ? $t('subscription.title')
-              : $t('subscription.titleUnsubscribed')
-          }}
-        </span>
-        <div class="pt-1">
-          <CloudBadge
-            reverse-order
-            background-color="var(--p-dialog-background)"
-          />
-        </div>
-      </div>
-
-      <!-- Workspace mode: workspace-aware subscription content (renders its own footer) -->
-      <SubscriptionPanelContentWorkspace v-if="shouldUseWorkspaceBilling" />
-      <!-- Legacy mode: user-level subscription content -->
-      <template v-else>
-        <SubscriptionPanelContentLegacy />
-        <SubscriptionFooterLinks />
-      </template>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { defineAsyncComponent } from 'vue'
-
-import CloudBadge from '@/components/topbar/CloudBadge.vue'
-import { useBillingContext } from '@/composables/billing/useBillingContext'
-import { useBillingRouting } from '@/composables/billing/useBillingRouting'
-import SubscriptionFooterLinks from '@/platform/cloud/subscription/components/SubscriptionFooterLinks.vue'
-import SubscriptionPanelContentLegacy from '@/platform/cloud/subscription/components/SubscriptionPanelContentLegacy.vue'
-
-const SubscriptionPanelContentWorkspace = defineAsyncComponent(
-  () =>
-    import('@/platform/workspace/components/SubscriptionPanelContentWorkspace.vue')
-)
-
-const { shouldUseWorkspaceBilling } = useBillingRouting()
-
-const { canAccessSubscriptionFeatures } = useBillingContext()
-</script>
diff --git a/src/platform/cloud/subscription/components/SubscriptionPanelContentLegacy.test.ts b/src/platform/cloud/subscription/components/SubscriptionPanelContentLegacy.test.ts
deleted file mode 100644
index c2454c19e29..00000000000
--- a/src/platform/cloud/subscription/components/SubscriptionPanelContentLegacy.test.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import { render, screen } from '@testing-library/vue'
-import userEvent from '@testing-library/user-event'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { computed, ref } from 'vue'
-import { createI18n } from 'vue-i18n'
-
-import SubscriptionPanelContentLegacy from './SubscriptionPanelContentLegacy.vue'
-
-const mockAccessBillingPortal = vi.fn()
-const mockTrackSubscriptionCancellation = vi.fn()
-const mockShowSubscriptionDialog = vi.fn()
-const mockHandleRefresh = vi.fn()
-
-const mockIsActiveSubscription = ref(true)
-const mockIsCancelled = ref(false)
-const mockIsFreeTier = ref(false)
-const mockSubscriptionTier = ref<'STANDARD' | 'CREATOR' | 'PRO' | null>(
-  'STANDARD'
-)
-const mockIsYearlySubscription = ref(true)
-
-vi.mock('@/composables/auth/useAuthActions', () => ({
-  useAuthActions: () => ({
-    accessBillingPortal: mockAccessBillingPortal
-  })
-}))
-
-vi.mock('@/platform/telemetry', () => ({
-  useTelemetry: () => ({
-    trackSubscriptionCancellation: mockTrackSubscriptionCancellation
-  })
-}))
-
-vi.mock('@/platform/cloud/subscription/composables/useSubscription', () => ({
-  useSubscription: () => ({
-    canAccessSubscriptionFeatures: computed(
-      () => mockIsActiveSubscription.value
-    ),
-    isCancelled: computed(() => mockIsCancelled.value),
-    isFreeTier: computed(() => mockIsFreeTier.value),
-    formattedRenewalDate: computed(() => '2026-08-01'),
-    formattedEndDate: computed(() => '2026-08-01'),
-    subscriptionTier: computed(() => mockSubscriptionTier.value),
-    subscriptionTierName: computed(() => 'Standard'),
-    isYearlySubscription: computed(() => mockIsYearlySubscription.value)
-  })
-}))
-
-vi.mock(
-  '@/platform/cloud/subscription/composables/useSubscriptionActions',
-  () => ({
-    useSubscriptionActions: () => ({
-      handleRefresh: mockHandleRefresh
-    })
-  })
-)
-
-vi.mock(
-  '@/platform/cloud/subscription/composables/useSubscriptionDialog',
-  () => ({
-    useSubscriptionDialog: () => ({
-      show: mockShowSubscriptionDialog
-    })
-  })
-)
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: {
-    en: {
-      subscription: {
-        perMonth: '/ month',
-        manageSubscription: 'Manage subscription',
-        upgradePlan: 'Upgrade plan',
-        subscribeNow: 'Subscribe now',
-        yourPlanIncludes: 'Your plan includes',
-        viewMoreDetailsPlans: 'View more details',
-        renewsDate: 'Renews {date}',
-        expiresDate: 'Expires {date}',
-        monthlyCreditsLabel: 'monthly credits',
-        maxDurationLabel: 'max duration',
-        gpuLabel: 'GPU access',
-        addCreditsLabel: 'Add credits',
-        customLoRAsLabel: 'Custom LoRAs',
-        maxDuration: {
-          standard: '30 min'
-        }
-      }
-    }
-  }
-})
-
-function renderComponent() {
-  return render(SubscriptionPanelContentLegacy, {
-    global: {
-      plugins: [i18n],
-      stubs: {
-        CreditsTile: true,
-        SubscribeButton: true,
-        Button: {
-          template: '<button @click="$emit(\'click\')"><slot /></button>',
-          emits: ['click']
-        }
-      }
-    }
-  })
-}
-
-describe('SubscriptionPanelContentLegacy', () => {
-  beforeEach(() => {
-    mockAccessBillingPortal.mockResolvedValue(undefined)
-    mockIsActiveSubscription.value = true
-    mockIsCancelled.value = false
-    mockIsFreeTier.value = false
-    mockSubscriptionTier.value = 'STANDARD'
-    mockIsYearlySubscription.value = true
-  })
-
-  it('tracks cancel intent before opening the billing portal', async () => {
-    renderComponent()
-
-    await userEvent.click(
-      screen.getByRole('button', { name: /manage subscription/i })
-    )
-
-    expect(mockTrackSubscriptionCancellation).toHaveBeenCalledExactlyOnceWith(
-      'flow_opened',
-      {
-        source: 'manage_subscription_button',
-        current_tier: 'standard',
-        cycle: 'yearly'
-      }
-    )
-    expect(mockAccessBillingPortal).toHaveBeenCalledOnce()
-  })
-})
diff --git a/src/platform/cloud/subscription/components/SubscriptionPanelContentLegacy.vue b/src/platform/cloud/subscription/components/SubscriptionPanelContentLegacy.vue
deleted file mode 100644
index d3cb1582fa8..00000000000
--- a/src/platform/cloud/subscription/components/SubscriptionPanelContentLegacy.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<template>
-  <div class="grow overflow-auto">
-    <div class="rounded-2xl border border-interface-stroke p-6">
-      <div>
-        <div class="flex items-center justify-between gap-2">
-          <div class="flex flex-col gap-2">
-            <div class="text-sm font-bold text-text-primary">
-              {{ subscriptionTierName }}
-            </div>
-            <div class="flex items-baseline gap-1 font-inter font-semibold">
-              <span class="text-2xl">${{ tierPrice }}</span>
-              <span class="text-base">{{ $t('subscription.perMonth') }}</span>
-            </div>
-            <div
-              v-if="canAccessSubscriptionFeatures"
-              class="text-sm text-text-secondary"
-            >
-              <template v-if="isCancelled">
-                {{
-                  $t('subscription.expiresDate', {
-                    date: formattedEndDate
-                  })
-                }}
-              </template>
-              <template v-else>
-                {{
-                  $t('subscription.renewsDate', {
-                    date: formattedRenewalDate
-                  })
-                }}
-              </template>
-            </div>
-          </div>
-
-          <Button
-            v-if="canAccessSubscriptionFeatures && !isFreeTier"
-            variant="secondary"
-            class="ml-auto rounded-lg bg-interface-menu-component-surface-selected px-4 py-2 text-sm font-normal text-text-primary"
-            @click="handleManageSubscription"
-          >
-            {{ $t('subscription.manageSubscription') }}
-          </Button>
-          <Button
-            v-if="canAccessSubscriptionFeatures"
-            variant="primary"
-            class="rounded-lg px-4 py-2 text-sm font-normal text-text-primary"
-            @click="
-              showSubscriptionDialog({ reason: 'settings_billing_panel' })
-            "
-          >
-            {{ $t('subscription.upgradePlan') }}
-          </Button>
-
-          <SubscribeButton
-            v-if="!canAccessSubscriptionFeatures"
-            :label="$t('subscription.subscribeNow')"
-            size="sm"
-            :fluid="false"
-            class="text-xs"
-            @subscribed="handleRefresh"
-          />
-        </div>
-      </div>
-
-      <div class="flex flex-col gap-6 pt-9 lg:flex-row">
-        <div class="w-full lg:max-w-md">
-          <CreditsTile />
-        </div>
-
-        <div class="flex flex-col gap-2">
-          <div class="text-sm text-text-primary">
-            {{ $t('subscription.yourPlanIncludes') }}
-          </div>
-
-          <div class="flex flex-col gap-0">
-            <div
-              v-for="benefit in tierBenefits"
-              :key="benefit.key"
-              class="flex items-center gap-2 py-2"
-            >
-              <i
-                v-if="benefit.type === 'feature'"
-                class="pi pi-check text-xs text-text-primary"
-              />
-              <span
-                v-else-if="benefit.type === 'metric' && benefit.value"
-                class="text-sm font-normal whitespace-nowrap text-text-primary"
-              >
-                {{ benefit.value }}
-              </span>
-              <span class="text-sm text-muted">
-                {{ benefit.label }}
-              </span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- View More Details - Outside main content -->
-    <div class="flex items-center gap-2 py-4">
-      <i class="pi pi-external-link text-muted"></i>
-      <a
-        href="https://www.comfy.org/cloud/pricing"
-        target="_blank"
-        rel="noopener noreferrer"
-        class="text-sm text-muted underline hover:opacity-80"
-      >
-        {{ $t('subscription.viewMoreDetailsPlans') }}
-      </a>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import Button from '@/components/ui/button/Button.vue'
-import { useAuthActions } from '@/composables/auth/useAuthActions'
-import CreditsTile from '@/platform/cloud/subscription/components/CreditsTile.vue'
-import SubscribeButton from '@/platform/cloud/subscription/components/SubscribeButton.vue'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
-import { useTelemetry } from '@/platform/telemetry'
-import { useSubscriptionActions } from '@/platform/cloud/subscription/composables/useSubscriptionActions'
-import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
-import {
-  DEFAULT_TIER_KEY,
-  getTierPrice,
-  toTierKey
-} from '@/platform/cloud/subscription/constants/tierPricing'
-import type { TierBenefit } from '@/platform/cloud/subscription/utils/tierBenefits'
-import { getCommonTierBenefits } from '@/platform/cloud/subscription/utils/tierBenefits'
-
-const authActions = useAuthActions()
-const { t, n } = useI18n()
-
-const {
-  canAccessSubscriptionFeatures,
-  isCancelled,
-  isFreeTier,
-  formattedRenewalDate,
-  formattedEndDate,
-  subscriptionTier,
-  subscriptionTierName,
-  isYearlySubscription
-} = useSubscription()
-
-const { show: showSubscriptionDialog } = useSubscriptionDialog()
-
-const tierKey = computed(() => {
-  const tier = subscriptionTier.value
-  if (!tier) return DEFAULT_TIER_KEY
-  return toTierKey(tier) ?? DEFAULT_TIER_KEY
-})
-const tierPrice = computed(() =>
-  getTierPrice(tierKey.value, isYearlySubscription.value)
-)
-
-// The portal is the only place a legacy user can cancel (in-app UI already
-// covers plan changes), so this click is the closest observable cancel-intent
-// signal on the mainline path.
-async function handleManageSubscription() {
-  useTelemetry()?.trackSubscriptionCancellation('flow_opened', {
-    source: 'manage_subscription_button',
-    current_tier: subscriptionTier.value?.toLowerCase(),
-    cycle: isYearlySubscription.value ? 'yearly' : 'monthly'
-  })
-  await authActions.accessBillingPortal()
-}
-
-const tierBenefits = computed((): TierBenefit[] =>
-  getCommonTierBenefits(tierKey.value, t, n)
-)
-
-const { handleRefresh } = useSubscriptionActions()
-</script>
-
-<style scoped>
-:deep(.bg-comfy-menu-secondary) {
-  background-color: transparent;
-}
-</style>
diff --git a/src/platform/cloud/subscription/composables/useSubscription.ts b/src/platform/cloud/subscription/composables/useSubscription.ts
index 3279d8ac7e2..3f795828f6b 100644
--- a/src/platform/cloud/subscription/composables/useSubscription.ts
+++ b/src/platform/cloud/subscription/composables/useSubscription.ts
@@ -280,7 +280,6 @@ function useSubscriptionInternal() {
 
   /**
    * Whether cloud subscription mode is enabled (cloud distribution with subscription_required config).
-   * Use to determine which UI to show (SubscriptionPanel vs CreditsPanel).
    */
   const isSubscriptionEnabled = (): boolean =>
     Boolean(isCloud && window.__CONFIG__?.subscription_required)
diff --git a/src/platform/settings/composables/useSettingUI.test.ts b/src/platform/settings/composables/useSettingUI.test.ts
index 67873bde5c9..9f5a152f0b9 100644
--- a/src/platform/settings/composables/useSettingUI.test.ts
+++ b/src/platform/settings/composables/useSettingUI.test.ts
@@ -20,8 +20,6 @@ const env = vi.hoisted(() => {
     authenticatedConfigLoaded: false,
     partnerNodeGovernanceEnabled: false,
     userSecretsEnabled: false,
-    isActiveSubscription: false,
-    billingType: 'legacy' as 'legacy' | 'workspace',
     workspaceRole: 'owner' as 'owner' | 'member',
     partnerNodeGovernanceStatus: 'inactive' as
       | 'inactive'
@@ -48,13 +46,6 @@ vi.mock('@/composables/auth/useCurrentUser', () => ({
   useCurrentUser: () => ({ isLoggedIn: env.fakeRef('isLoggedIn') })
 }))
 
-vi.mock('@/composables/billing/useBillingContext', () => ({
-  useBillingContext: () => ({
-    canAccessSubscriptionFeatures: env.fakeRef('isActiveSubscription'),
-    type: env.fakeRef('billingType')
-  })
-}))
-
 vi.mock('@/composables/useFeatureFlags', () => ({
   useFeatureFlags: () => ({
     flags: {
@@ -151,8 +142,6 @@ describe('useSettingUI', () => {
       authenticatedConfigLoaded: false,
       partnerNodeGovernanceEnabled: false,
       userSecretsEnabled: false,
-      isActiveSubscription: false,
-      billingType: 'legacy',
       workspaceRole: 'owner',
       partnerNodeGovernanceStatus: 'inactive',
       partnerNodeGovernanceProviders: []
@@ -233,9 +222,7 @@ describe('useSettingUI', () => {
       Object.assign(env.state, {
         isCloud: true,
         isLoggedIn: true,
-        authenticatedConfigLoaded: true,
-        isActiveSubscription: true,
-        billingType: 'workspace'
+        authenticatedConfigLoaded: true
       })
       window.__CONFIG__ = {
         subscription_required: false
@@ -312,24 +299,18 @@ describe('useSettingUI', () => {
         isLoggedIn: true,
         billingControlEnabled: true,
         authenticatedConfigLoaded: true,
-        partnerNodeGovernanceEnabled: true,
-        isActiveSubscription: true
+        partnerNodeGovernanceEnabled: true
       })
       window.__CONFIG__ = {
         subscription_required: true
       } as typeof window.__CONFIG__
     })
 
-    it.for(['legacy', 'workspace'] as const)(
-      'uses only the Workspace panel for %s billing in the workspace layout',
-      (billingType) => {
-        env.state.billingType = billingType
-        const { navGroups } = useSettingUI()
+    it('uses the Workspace panel for Cloud billing navigation', () => {
+      const { navGroups } = useSettingUI()
 
-        expect(navKeys(navGroups.value)).not.toContain('subscription')
-        expect(navKeys(navGroups.value)).toContain('workspace')
-      }
-    )
+      expect(navKeys(navGroups.value)).toContain('workspace')
+    })
 
     it('exposes workspace sections as Plan & Credits, Members, and Allowlist', () => {
       const { navGroups } = useSettingUI()
diff --git a/src/platform/settings/composables/useSettingUI.ts b/src/platform/settings/composables/useSettingUI.ts
index baa370e3c39..6afee8ddc82 100644
--- a/src/platform/settings/composables/useSettingUI.ts
+++ b/src/platform/settings/composables/useSettingUI.ts
@@ -34,7 +34,6 @@ const CATEGORY_ICONS: Record<string, string> = {
   PlanCredits: 'icon-[lucide--receipt-text]',
   secrets: 'icon-[lucide--key-round]',
   'server-config': 'icon-[lucide--server]',
-  subscription: 'icon-[lucide--credit-card]',
   user: 'icon-[lucide--user]',
   workspace: 'icon-[lucide--building-2]',
   'workspace-allowlist': 'icon-[comfy--ai-model]',
diff --git a/src/platform/settings/types.ts b/src/platform/settings/types.ts
index bb5765fe513..a108c4dca68 100644
--- a/src/platform/settings/types.ts
+++ b/src/platform/settings/types.ts
@@ -84,7 +84,6 @@ export type SettingPanelType =
   | 'keybinding'
   | 'secrets'
   | 'server-config'
-  | 'subscription'
   | 'user'
   | 'workspace'
   | 'workspace-allowlist'