From acb469fa1e3a483807eb726a3c0e6b66835757fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20V=C3=ADt?= <slipiklp@gmail.com>
Date: Tue, 28 Jul 2026 11:34:14 +0200
Subject: [PATCH] refactor: extract cloud billing behind host extension points

Cloud billing no longer lives in this repository. The hosting deployment
owns it end-to-end and plugs in through generic extension points:

- OrganizationBillingPort is replaced by the billing-agnostic
  OrganizationLifecyclePort (organizationCreated hook, noop community
  layer); generate-id gains createIdGenerator so hosts mint their own
  prefixed ids without registering prefixes here.
- The five billing tables (organization_billing, usage_record,
  usage_aggregate, billing_webhook_event, billing_provider_meter) leave
  the schema. The new migration is deliberately a no-op: the tables are
  owned by the hosting deployment and keep their data; drizzle
  tablesFilter entries guard against future generated drops.
- BackendRuntimeCapabilities becomes a generic Record<string, boolean>;
  the community backend advertises {} and the selfhost smoke asserts
  that.
- The studio sidebar takes extension nav items from a slot module, the
  marketing nav from a config module (both empty here, aliased by the
  hosted app), and the cloud /pricing page plus the pricing-preview
  harness and unused billing API error contracts are removed.

Product payment semantics (App Store / Google Play / Stripe billing
retry, grace periods, Play Billing SDK) are untouched.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 apps/backend/src/BackendApp.ts                |  22 +-
 .../backend/src/rpc-smoke.integration.test.ts |   2 +-
 apps/backend/src/testing/smoke-ids.ts         |   1 -
 apps/backend/src/testing/smoke-seed.ts        |  25 +-
 apps/www/scripts/pricing-preview/index.html   |  12 -
 apps/www/scripts/pricing-preview/main.tsx     |   6 -
 .../scripts/pricing-preview/vite.config.ts    |  16 --
 .../docs/component-overview/cards/faq.tsx     |  22 +-
 .../component-overview/cards/sidebar-nav.tsx  |  12 +-
 .../docs/api/organizations-and-projects.mdx   |   2 +-
 .../enterprise/organization-nav-slot.ts       |  27 ++
 .../studio/enterprise/runtime-capabilities.ts |  33 ++-
 .../sidebar/organization-settings-sidebar.tsx | 106 -------
 .../sidebar/organization-sidebar.tsx          |  10 +-
 .../www/landing/marketing-nav-config.ts       |  14 +
 .../features/www/landing/sections/footer.tsx  |   4 +-
 .../features/www/landing/sections/navbar.tsx  |  65 ++---
 apps/www/src/features/www/pricing/plans.ts    | 237 ----------------
 .../src/features/www/pricing/pricing-model.ts | 138 ----------
 .../src/features/www/pricing/pricing-page.tsx |  37 ---
 .../www/pricing/sections/calculator.tsx       | 259 ------------------
 .../src/features/www/pricing/sections/faq.tsx |  34 ---
 .../features/www/pricing/sections/hero.tsx    |  24 --
 .../features/www/pricing/sections/matrix.tsx  | 111 --------
 .../features/www/pricing/sections/plans.tsx   |  83 ------
 .../www/pricing/sections/self-host.tsx        |  26 --
 apps/www/src/routeTree.gen.ts                 |  21 --
 apps/www/src/routes/_marketing/pricing.tsx    |  11 -
 drizzle.config.ts                             |  17 +-
 packages/api-contracts/src/errors/Billing.ts  |  28 --
 packages/api-contracts/src/errors/index.ts    |   1 -
 packages/core/package.json                    |   2 +-
 packages/core/src/services/index.ts           |   2 +-
 .../organizations/OrganizationBillingPort.ts  |  31 ---
 .../OrganizationLifecyclePort.ts              |  31 +++
 .../organizations/OrganizationService.ts      |  20 +-
 .../core/src/services/slack/slack-client.ts   |   8 +-
 packages/core/src/utils/generate-id.ts        |  19 +-
 .../OrganizationBillingPort.test.ts           |  13 -
 .../OrganizationLifecyclePort.test.ts         |  13 +
 .../OrganizationService.integration.test.ts   | 135 ++++-----
 packages/core/test/utils/generate-id.test.ts  |   2 +-
 .../migration.sql                             |  10 +
 packages/db/src/relations.ts                  |   6 -
 packages/db/src/schema.ts                     | 211 +-------------
 packages/db/src/types.ts                      |  19 +-
 packages/shared/src/billing.ts                |   3 -
 packages/shared/src/index.ts                  |   1 -
 selfhost/smoke.mts                            |   5 +-
 turbo.json                                    |   1 -
 50 files changed, 301 insertions(+), 1637 deletions(-)
 delete mode 100644 apps/www/scripts/pricing-preview/index.html
 delete mode 100644 apps/www/scripts/pricing-preview/main.tsx
 delete mode 100644 apps/www/scripts/pricing-preview/vite.config.ts
 create mode 100644 apps/www/src/features/studio/enterprise/organization-nav-slot.ts
 delete mode 100644 apps/www/src/features/studio/shell/components/sidebar/organization-settings-sidebar.tsx
 create mode 100644 apps/www/src/features/www/landing/marketing-nav-config.ts
 delete mode 100644 apps/www/src/features/www/pricing/plans.ts
 delete mode 100644 apps/www/src/features/www/pricing/pricing-model.ts
 delete mode 100644 apps/www/src/features/www/pricing/pricing-page.tsx
 delete mode 100644 apps/www/src/features/www/pricing/sections/calculator.tsx
 delete mode 100644 apps/www/src/features/www/pricing/sections/faq.tsx
 delete mode 100644 apps/www/src/features/www/pricing/sections/hero.tsx
 delete mode 100644 apps/www/src/features/www/pricing/sections/matrix.tsx
 delete mode 100644 apps/www/src/features/www/pricing/sections/plans.tsx
 delete mode 100644 apps/www/src/features/www/pricing/sections/self-host.tsx
 delete mode 100644 apps/www/src/routes/_marketing/pricing.tsx
 delete mode 100644 packages/api-contracts/src/errors/Billing.ts
 delete mode 100644 packages/core/src/services/organizations/OrganizationBillingPort.ts
 create mode 100644 packages/core/src/services/organizations/OrganizationLifecyclePort.ts
 delete mode 100644 packages/core/test/services/organizations/OrganizationBillingPort.test.ts
 create mode 100644 packages/core/test/services/organizations/OrganizationLifecyclePort.test.ts
 create mode 100644 packages/db/src/alchemy-migrations/20260728120000_remove_billing_tables/migration.sql
 delete mode 100644 packages/shared/src/billing.ts

diff --git a/apps/backend/src/BackendApp.ts b/apps/backend/src/BackendApp.ts
index a3583e2e2..04fbc2701 100644
--- a/apps/backend/src/BackendApp.ts
+++ b/apps/backend/src/BackendApp.ts
@@ -36,7 +36,7 @@ import {
   NotificationSendingService,
   NotificationsConfigurationService,
   NotificationTokenService,
-  OrganizationBillingPort,
+  OrganizationLifecyclePort,
   OrganizationMembershipSyncPort,
   OrganizationMembershipWebhookPort,
   OrganizationService,
@@ -637,10 +637,8 @@ const HealthCheckRoute = Layer.effectDiscard(
   }),
 );
 
-export interface BackendRuntimeCapabilities {
-  readonly auditLogs: boolean;
-  readonly billing: boolean;
-}
+/** Feature-supplied capability flags advertised to clients, keyed by feature name. */
+export type BackendRuntimeCapabilities = Readonly<Record<string, boolean>>;
 
 const RuntimeCapabilitiesRoute = (capabilities: BackendRuntimeCapabilities) =>
   Layer.effectDiscard(
@@ -658,7 +656,7 @@ const RuntimeCapabilitiesRoute = (capabilities: BackendRuntimeCapabilities) =>
 
 export type BackendCoreFeatureServices =
   | AuditLogPort
-  | OrganizationBillingPort
+  | OrganizationLifecyclePort
   | OrganizationMembershipSyncPort
   | OrganizationMembershipWebhookPort;
 
@@ -924,12 +922,12 @@ export interface BackendFeatureComposition<RFeatureRpcs extends Rpc.Any, RFeatur
 export const NoBackendFeatures: BackendFeatureComposition<never, never> = {
   group: RpcGroup.make(),
   routes: () => Layer.empty,
-  runtimeCapabilities: { auditLogs: false, billing: false },
+  runtimeCapabilities: {},
   services: () => Layer.empty,
   supportServices: () =>
     Layer.mergeAll(
       AuditLogPort.noop,
-      OrganizationBillingPort.noop,
+      OrganizationLifecyclePort.noop,
       OrganizationMembershipSyncPort.noop,
       OrganizationMembershipWebhookPort.noop,
     ),
@@ -1067,10 +1065,10 @@ export const buildBackendFetch = <
   // layer dependency — so `Layer.provide` does not discharge it (it would
   // silently leak to the request handler and die with "Service not found").
   // `HttpRouter.provideRequest` is the combinator that satisfies these
-  // request-scoped requirements. The Autumn webhook handler resolves `Db` +
-  // `BillingService` at request time (both part of the merged graph below);
-  // the Apple handler resolves the live public App Store service the same way;
-  // the Google handler additionally resolves its Pub/Sub OIDC verifier.
+  // request-scoped requirements. Feature-supplied webhook routes resolve their
+  // own services at request time the same way (all part of the merged graph
+  // below); the Apple handler resolves the live public App Store service; the
+  // Google handler additionally resolves its Pub/Sub OIDC verifier.
   const WebhookRoutesLayer = Layer.mergeAll(
     AppleServerToServerNotificationRouteLayer,
     GooglePlayRtdnNotificationRouteLayer,
diff --git a/apps/backend/src/rpc-smoke.integration.test.ts b/apps/backend/src/rpc-smoke.integration.test.ts
index 8eda92f78..335a493a7 100644
--- a/apps/backend/src/rpc-smoke.integration.test.ts
+++ b/apps/backend/src/rpc-smoke.integration.test.ts
@@ -407,7 +407,7 @@ describe("Backend runtime capabilities", () => {
     );
 
     expect(status).toBe(200);
-    expect(JSON.parse(text)).toEqual({ enterprise: { auditLogs: false, billing: false } });
+    expect(JSON.parse(text)).toEqual({ enterprise: {} });
   });
 });
 
diff --git a/apps/backend/src/testing/smoke-ids.ts b/apps/backend/src/testing/smoke-ids.ts
index 9e210ced4..6a9fe7c36 100644
--- a/apps/backend/src/testing/smoke-ids.ts
+++ b/apps/backend/src/testing/smoke-ids.ts
@@ -18,7 +18,6 @@ export const makeSmokeIds = (runId: string) => {
     adminMemberId: `smk_mem_admin_${suffix}`,
     adminUserId: `smk_admin_${suffix}`,
     apiKeyId: `smk_api_key_${suffix}`,
-    billingId: `smk_billing_${suffix}`,
     invitedEmail: `smoke-invite-${suffix}@example.test`,
     invitedUserId: `smk_invite_${suffix}`,
     normalEmail: `smoke-user-${suffix}@example.test`,
diff --git a/apps/backend/src/testing/smoke-seed.ts b/apps/backend/src/testing/smoke-seed.ts
index 7ab768d49..8962b294f 100644
--- a/apps/backend/src/testing/smoke-seed.ts
+++ b/apps/backend/src/testing/smoke-seed.ts
@@ -2,8 +2,6 @@ import {
   apiKeys,
   apikey,
   auditLogs,
-  BillingSubscriptionStatus,
-  BillingTier,
   captureProjectPolicies,
   Db,
   eq,
@@ -15,7 +13,6 @@ import {
   invitation,
   member,
   organization,
-  organizationBilling,
   paymentProviderConfigurationProducts,
   paymentProviderConfigurations,
   paywallLocationShowings,
@@ -33,8 +30,6 @@ import {
   productPerks,
   products,
   projects,
-  usageAggregates,
-  usageRecords,
   user,
   webhookDeliveries,
   webhookDeliveryAttempts,
@@ -46,8 +41,8 @@ import { makeSmokeIds } from "./smoke-ids.ts";
 
 /**
  * Deterministic fixture for the backend RPC smoke. Seeds an `admin`-role user, a
- * normal user, their organization/memberships, a project, a seeded API key, and a
- * billing row — everything the {@link rpcSmokeCases} manifest reads or scopes
+ * normal user, their organization/memberships, a project, and a seeded API key
+ * — everything the {@link rpcSmokeCases} manifest reads or scopes
  * against. Kept separate from the lean shared `CoreTestFixture` because the smoke
  * needs a richer, smoke-specific tenant; it still rides the same once-deployed
  * stack + `testConnections` as the service-level integration tests.
@@ -186,11 +181,6 @@ export const resetSmokeData = (runId: string) =>
       .where(eq(captureProjectPolicies.projectId, ids.projectId));
     yield* db.delete(projects).where(eq(projects.id, ids.projectId));
 
-    yield* db.delete(usageRecords).where(eq(usageRecords.organizationId, ids.organizationId));
-    yield* db.delete(usageAggregates).where(eq(usageAggregates.organizationId, ids.organizationId));
-    yield* db
-      .delete(organizationBilling)
-      .where(eq(organizationBilling.organizationId, ids.organizationId));
     yield* db.delete(invitation).where(eq(invitation.organizationId, ids.organizationId));
     yield* db.delete(member).where(eq(member.organizationId, ids.organizationId));
     yield* db.delete(organization).where(eq(organization.id, ids.organizationId));
@@ -296,15 +286,4 @@ export const seedSmokeData = (runId: string) =>
       projectId: ids.projectId,
       updatedAt: now,
     });
-    yield* db.insert(organizationBilling).values({
-      billingProviderId: "smoke",
-      currentPeriodEnd: null,
-      currentPeriodStart: null,
-      externalCustomerId: null,
-      externalSubscriptionId: null,
-      id: ids.billingId,
-      organizationId: ids.organizationId,
-      subscriptionStatus: BillingSubscriptionStatus.None,
-      tier: BillingTier.Free,
-    });
   });
diff --git a/apps/www/scripts/pricing-preview/index.html b/apps/www/scripts/pricing-preview/index.html
deleted file mode 100644
index 612641f4f..000000000
--- a/apps/www/scripts/pricing-preview/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>Pricing preview</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/main.tsx"></script>
-  </body>
-</html>
diff --git a/apps/www/scripts/pricing-preview/main.tsx b/apps/www/scripts/pricing-preview/main.tsx
deleted file mode 100644
index 2bdb30894..000000000
--- a/apps/www/scripts/pricing-preview/main.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createRoot } from "react-dom/client";
-
-import "../../src/styles/globals.css";
-import { PricingPage } from "../../src/features/www/pricing/pricing-page";
-
-createRoot(document.getElementById("root")!).render(<PricingPage />);
diff --git a/apps/www/scripts/pricing-preview/vite.config.ts b/apps/www/scripts/pricing-preview/vite.config.ts
deleted file mode 100644
index 3ff532e40..000000000
--- a/apps/www/scripts/pricing-preview/vite.config.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import tailwindcss from "@tailwindcss/vite";
-import viteReact from "@vitejs/plugin-react";
-import { fileURLToPath } from "node:url";
-import { defineConfig } from "vite";
-
-export default defineConfig({
-  root: fileURLToPath(new URL(".", import.meta.url)),
-  plugins: [tailwindcss(), viteReact()],
-  resolve: {
-    alias: {
-      "@": fileURLToPath(new URL("../../src", import.meta.url)),
-    },
-    dedupe: ["react", "react-dom"],
-  },
-  server: { port: 5200 },
-});
diff --git a/apps/www/src/features/design/components/docs/component-overview/cards/faq.tsx b/apps/www/src/features/design/components/docs/component-overview/cards/faq.tsx
index 6819b81a6..b895b6033 100644
--- a/apps/www/src/features/design/components/docs/component-overview/cards/faq.tsx
+++ b/apps/www/src/features/design/components/docs/component-overview/cards/faq.tsx
@@ -20,18 +20,18 @@ const GENERAL_QUESTIONS = [
   },
 ];
 
-const BILLING_QUESTIONS = [
+const SYNC_QUESTIONS = [
   {
-    q: "What is the difference between Basic and Pro pricing tiers?",
-    a: "Basic includes budgeting, goal tracking, and up to 3 linked accounts. Pro adds unlimited accounts, dividend tracking, portfolio analysis, and priority support.",
+    q: "How often does data refresh?",
+    a: "Connected institutions sync every six hours, and you can pull a manual refresh from the account detail view at any time.",
   },
   {
-    q: "How do I cancel my subscription?",
-    a: "Go to Settings > Billing > Manage Plan and click Cancel. Your access continues until the end of your current billing period.",
+    q: "Why is a transaction missing?",
+    a: "Pending transactions appear once the institution posts them. If a posted transaction is still missing after 48 hours, reconnect the account from Settings.",
   },
   {
-    q: "Do you offer a free trial?",
-    a: "Yes. All new accounts start with a 14-day Pro trial. No credit card required.",
+    q: "Can I import a statement manually?",
+    a: "Yes. Upload a CSV or OFX file from the account detail view and map the columns once — the mapping is remembered for later imports.",
   },
 ];
 
@@ -72,8 +72,8 @@ export function Faq() {
             <TabsTrigger value="general" className="flex-1">
               General
             </TabsTrigger>
-            <TabsTrigger value="billing" className="flex-1">
-              Billing
+            <TabsTrigger value="sync" className="flex-1">
+              Sync
             </TabsTrigger>
             <TabsTrigger value="goals" className="flex-1">
               Goals
@@ -82,8 +82,8 @@ export function Faq() {
           <TabsContent value="general">
             <QuestionList questions={GENERAL_QUESTIONS} />
           </TabsContent>
-          <TabsContent value="billing">
-            <QuestionList questions={BILLING_QUESTIONS} />
+          <TabsContent value="sync">
+            <QuestionList questions={SYNC_QUESTIONS} />
           </TabsContent>
           <TabsContent value="goals">
             <QuestionList questions={GOALS_QUESTIONS} />
diff --git a/apps/www/src/features/design/components/docs/component-overview/cards/sidebar-nav.tsx b/apps/www/src/features/design/components/docs/component-overview/cards/sidebar-nav.tsx
index c391f4e38..ab3e6b1b9 100644
--- a/apps/www/src/features/design/components/docs/component-overview/cards/sidebar-nav.tsx
+++ b/apps/www/src/features/design/components/docs/component-overview/cards/sidebar-nav.tsx
@@ -172,13 +172,13 @@ export function SidebarNav() {
                     <SidebarMenuItem>
                       <SidebarMenuButton isActive>
                         <IconPlaceholder
-                          lucide="CreditCardIcon"
-                          tabler="IconCreditCard"
-                          hugeicons="CreditCardIcon"
-                          phosphor="CreditCardIcon"
-                          remixicon="RiBankCardLine"
+                          lucide="UsersIcon"
+                          tabler="IconUsers"
+                          hugeicons="UserMultipleIcon"
+                          phosphor="UsersIcon"
+                          remixicon="RiTeamLine"
                         />
-                        Billing
+                        Members
                       </SidebarMenuButton>
                     </SidebarMenuItem>
                     <SidebarMenuItem>
diff --git a/apps/www/src/features/docs/content/docs/api/organizations-and-projects.mdx b/apps/www/src/features/docs/content/docs/api/organizations-and-projects.mdx
index bc53978bb..332d410d2 100644
--- a/apps/www/src/features/docs/content/docs/api/organizations-and-projects.mdx
+++ b/apps/www/src/features/docs/content/docs/api/organizations-and-projects.mdx
@@ -4,7 +4,7 @@ description: Create organizations and projects, list the projects in an organiza
 ---
 
 Organizations and projects are the account-level containers in Voidhash. An **organization** groups
-your team and billing; a **project** lives inside an organization and owns everything else —
+your team; a **project** lives inside an organization and owns everything else —
 products, perks, paywalls, API keys, and persons. The endpoints on this page manage those
 containers and the user account itself.
 
diff --git a/apps/www/src/features/studio/enterprise/organization-nav-slot.ts b/apps/www/src/features/studio/enterprise/organization-nav-slot.ts
new file mode 100644
index 000000000..e219d6309
--- /dev/null
+++ b/apps/www/src/features/studio/enterprise/organization-nav-slot.ts
@@ -0,0 +1,27 @@
+import type { LucideIcon } from "lucide-react";
+
+import type { RuntimeCapabilities } from "./runtime-capabilities";
+
+/** A single sidebar entry, matching the item shape `SidebarShell` renders. */
+export interface OrganizationNavItem {
+  title: string;
+  url: string;
+  icon?: LucideIcon;
+  isActive?: () => boolean;
+}
+
+export interface OrganizationNavSlotContext {
+  readonly capabilities: RuntimeCapabilities | undefined;
+  readonly organizationSlug: string;
+  readonly pathname: string;
+}
+
+/**
+ * Community extension slot for host-provided organization settings entries.
+ * Hosts replace this module to append their own nav items.
+ */
+export function organizationSettingsNavItems(
+  _context: OrganizationNavSlotContext,
+): OrganizationNavItem[] {
+  return [];
+}
diff --git a/apps/www/src/features/studio/enterprise/runtime-capabilities.ts b/apps/www/src/features/studio/enterprise/runtime-capabilities.ts
index c4afc2d8e..0f152e930 100644
--- a/apps/www/src/features/studio/enterprise/runtime-capabilities.ts
+++ b/apps/www/src/features/studio/enterprise/runtime-capabilities.ts
@@ -2,11 +2,18 @@ import { useQuery } from "@tanstack/react-query";
 
 import { env } from "@/lib/env";
 
-const disabledCapabilities = {
-  enterprise: { auditLogs: false, billing: false },
-} as const;
+/** Enabled enterprise capability ids advertised by the host composition. */
+export type EnterpriseCapabilities = Readonly<Record<string, boolean>>;
 
-const loadRuntimeCapabilities = async () => {
+export interface RuntimeCapabilities {
+  readonly enterprise: EnterpriseCapabilities;
+}
+
+const disabledCapabilities: RuntimeCapabilities = {
+  enterprise: {},
+};
+
+const loadRuntimeCapabilities = async (): Promise<RuntimeCapabilities> => {
   try {
     const apiBaseUrl = env.VITE_APP_API_URL.replace(/\/+$/, "");
     const response = await fetch(`${apiBaseUrl}/api/runtime-capabilities`, {
@@ -15,17 +22,15 @@ const loadRuntimeCapabilities = async () => {
     if (!response.ok) return disabledCapabilities;
 
     const body = (await response.json()) as {
-      readonly enterprise?: {
-        readonly auditLogs?: unknown;
-        readonly billing?: unknown;
-      };
-    };
-    return {
-      enterprise: {
-        auditLogs: body.enterprise?.auditLogs === true,
-        billing: body.enterprise?.billing === true,
-      },
+      readonly enterprise?: Readonly<Record<string, unknown>>;
     };
+    const enterprise: Record<string, boolean> = {};
+    for (const [capability, enabled] of Object.entries(body.enterprise ?? {})) {
+      if (enabled === true) {
+        enterprise[capability] = true;
+      }
+    }
+    return { enterprise };
   } catch {
     return disabledCapabilities;
   }
diff --git a/apps/www/src/features/studio/shell/components/sidebar/organization-settings-sidebar.tsx b/apps/www/src/features/studio/shell/components/sidebar/organization-settings-sidebar.tsx
deleted file mode 100644
index 77f443d9d..000000000
--- a/apps/www/src/features/studio/shell/components/sidebar/organization-settings-sidebar.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-// "use client";
-
-// import type * as React from "react";
-
-// import { Link, useLocation, useParams } from "@tanstack/react-router";
-// import {
-//   GradientAvatar,
-//   Sidebar,
-//   SidebarContent,
-//   SidebarGroup,
-//   SidebarGroupLabel,
-//   SidebarHeader,
-//   SidebarMenu,
-//   SidebarMenuButton,
-//   SidebarMenuItem,
-// } from "@voidhash/ui";
-// import { useAuth } from "@/features/studio/components/auth-context";
-
-// import { NavMain } from "./nav-main";
-
-// const SidebarProjects = ({ organizationSlug }: { organizationSlug: string }) => {
-//   const { user } = useAuth();
-
-//   const organization = user.organizations.find((o) => o.slug === organizationSlug);
-//   const projects = organization
-//     ? user.projects.filter((p) => p.organizationId === organization.id)
-//     : [];
-
-//   return (
-//     <SidebarMenu>
-//       {projects.map((project) => (
-//         <SidebarMenuItem key={project.id}>
-//           <SidebarMenuButton asChild isActive={false} tooltip={null}>
-//             <Link
-//               params={{ organizationSlug, projectSlug: project.slug }}
-//               to="/studio/$organizationSlug/$projectSlug/settings/general"
-//             >
-//               <div className="flex items-center gap-2">
-//                 <GradientAvatar
-//                   alt={project.name}
-//                   className="h-6 w-6 rounded-lg text-xs"
-//                   fallback={project.id}
-//                   src={undefined}
-//                 />
-//                 <span className="truncate text-foreground- text-sm">{project.name}</span>
-//               </div>
-//             </Link>
-//           </SidebarMenuButton>
-//         </SidebarMenuItem>
-//       ))}
-//     </SidebarMenu>
-//   );
-// };
-
-// export function OrganizationSettingsSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
-//   const pathname = useLocation({
-//     select: (location) => location.pathname,
-//   });
-//   const { organizationSlug } = useParams({
-//     strict: false,
-//   });
-
-//   const data = {
-//     navMain: [
-//       {
-//         items: [
-//           {
-//             isActive: () => pathname.startsWith(`/studio/${organizationSlug}/~/settings/general`),
-//             title: "General",
-//             url: `/studio/${organizationSlug}/~/settings/general`,
-//           },
-//           {
-//             isActive: () => pathname.startsWith(`/studio/${organizationSlug}/~/settings/billing`),
-//             title: "Billing",
-//             url: `/studio/${organizationSlug}/~/settings/billing`,
-//           },
-//         ],
-//         title: "Team",
-//       },
-//     ],
-//   };
-
-//   return (
-//     <Sidebar
-//       className="!top-[var(--header-height)] !h-[calc(100svh-var(--header-height))] sticky flex border-r transition-all duration-75"
-//       collapsible="none"
-//       variant="inset"
-//       {...props}
-//     >
-//       <SidebarHeader className="gap-3.5 border-b p-4">
-//         <div className="flex w-full items-center justify-between">
-//           <div className="font-medium text-base text-foreground">Team Settings</div>
-//         </div>
-//       </SidebarHeader>
-//       <SidebarContent>
-//         <NavMain groups={data.navMain} link={Link} tooltips="disabled" />
-//         <SidebarGroup>
-//           <SidebarGroupLabel>Projects</SidebarGroupLabel>
-//           <SidebarProjects
-//             organizationSlug={typeof organizationSlug === "string" ? organizationSlug : ""}
-//           />
-//         </SidebarGroup>
-//       </SidebarContent>
-//     </Sidebar>
-//   );
-// }
diff --git a/apps/www/src/features/studio/shell/components/sidebar/organization-sidebar.tsx b/apps/www/src/features/studio/shell/components/sidebar/organization-sidebar.tsx
index ddb947a93..30046b9a2 100644
--- a/apps/www/src/features/studio/shell/components/sidebar/organization-sidebar.tsx
+++ b/apps/www/src/features/studio/shell/components/sidebar/organization-sidebar.tsx
@@ -14,6 +14,7 @@ import {
 import { Grid2X2, Plus, Settings } from "lucide-react";
 import { useState } from "react";
 import { useAuth } from "@/features/studio/components/auth-context";
+import { organizationSettingsNavItems } from "@/features/studio/enterprise/organization-nav-slot";
 import { useRuntimeCapabilities } from "@/features/studio/enterprise/runtime-capabilities";
 import { CreateProjectModal } from "@/features/studio/projects/create-project-modal";
 
@@ -61,14 +62,7 @@ export function OrganizationSidebar({
                 title: "General",
                 url: `/studio/${organizationSlug}/~/settings`,
               },
-              ...(capabilities?.enterprise.billing
-                ? [{
-                    isActive: () =>
-                      pathname.startsWith(`/studio/${organizationSlug}/~/settings/billing`),
-                    title: "Billing",
-                    url: `/studio/${organizationSlug}/~/settings/billing`,
-                  }]
-                : []),
+              ...organizationSettingsNavItems({ capabilities, organizationSlug, pathname }),
             ],
           },
         ],
diff --git a/apps/www/src/features/www/landing/marketing-nav-config.ts b/apps/www/src/features/www/landing/marketing-nav-config.ts
new file mode 100644
index 000000000..3b31c5c67
--- /dev/null
+++ b/apps/www/src/features/www/landing/marketing-nav-config.ts
@@ -0,0 +1,14 @@
+import type { LucideIcon } from "lucide-react";
+
+/** A marketing navigation link. Hrefs are plain strings so hosts can add pages the OSS build has no route for. */
+export interface MarketingNavLink {
+  label: string;
+  href: string;
+  icon: LucideIcon;
+}
+
+/**
+ * Company links rendered in the marketing navbar and footer. The community build
+ * ships none; hosts replace this module to add the pages their deployment has.
+ */
+export const MARKETING_COMPANY_LINKS: MarketingNavLink[] = [];
diff --git a/apps/www/src/features/www/landing/sections/footer.tsx b/apps/www/src/features/www/landing/sections/footer.tsx
index c926bd510..9842d065f 100644
--- a/apps/www/src/features/www/landing/sections/footer.tsx
+++ b/apps/www/src/features/www/landing/sections/footer.tsx
@@ -1,5 +1,7 @@
 import { Logo } from "@voidhash/ui";
 
+import { MARKETING_COMPANY_LINKS } from "@/features/www/landing/marketing-nav-config";
+
 const GITHUB_REPO = "https://github.com/voidhashcom/voidhash";
 
 const LINK_COLUMNS: {
@@ -39,7 +41,7 @@ const LINK_COLUMNS: {
   {
     title: "COMPANY",
     links: [
-      { label: "Pricing", href: "/pricing" },
+      ...MARKETING_COMPANY_LINKS.map((link) => ({ label: link.label, href: link.href })),
       { label: "Blog" },
       { label: "Security" },
       { label: "Privacy" },
diff --git a/apps/www/src/features/www/landing/sections/navbar.tsx b/apps/www/src/features/www/landing/sections/navbar.tsx
index 5c4f4e485..cdf1a92cf 100644
--- a/apps/www/src/features/www/landing/sections/navbar.tsx
+++ b/apps/www/src/features/www/landing/sections/navbar.tsx
@@ -24,10 +24,10 @@ import {
   LayoutTemplateIcon,
   type LucideIcon,
   MenuIcon,
-  TagIcon,
   UsersIcon,
 } from "lucide-react";
 
+import { MARKETING_COMPANY_LINKS } from "@/features/www/landing/marketing-nav-config";
 import { signUpCtaLabel } from "@/lib/waitlist";
 
 type NavLink = {
@@ -38,8 +38,9 @@ type NavLink = {
 };
 
 /**
- * Product links point at landing page sections, so they stay root-relative: from `/pricing` a
- * bare `#paywalls` fragment resolves against a page that has no such section and goes nowhere.
+ * Product links point at landing page sections, so they stay root-relative: from a standalone
+ * marketing page a bare `#paywalls` fragment resolves against a page that has no such section
+ * and goes nowhere.
  */
 const PRODUCT_LINKS: NavLink[] = [
   {
@@ -73,8 +74,6 @@ const DEVELOPER_LINKS: NavLink[] = [
   { label: "API reference", href: "/docs/api", icon: BracesIcon },
 ];
 
-const PRICING_LINK: NavLink = { label: "Pricing", href: "/pricing", icon: TagIcon };
-
 /** Shared look for the top-level triggers and links. */
 const NAV_ITEM_CLASS =
   "h-auto rounded-lg px-3 py-2 font-normal font-sans text-zinc-400 text-sm/4.5 tracking-[-0.03em] transition-colors hover:bg-white/5 hover:text-white focus:bg-white/5 focus:text-white data-pressed:bg-white/10 data-popup-open:bg-white/5 data-popup-open:text-white data-popup-open:hover:bg-white/5";
@@ -147,14 +146,16 @@ export function LandingNavbar() {
                 </ul>
               </NavigationMenuContent>
             </NavigationMenuItem>
-            <NavigationMenuItem>
-              <NavigationMenuLink
-                className={`${navigationMenuTriggerStyle()} ${NAV_ITEM_CLASS}`}
-                render={<a href={PRICING_LINK.href} />}
-              >
-                {PRICING_LINK.label}
-              </NavigationMenuLink>
-            </NavigationMenuItem>
+            {MARKETING_COMPANY_LINKS.map((link) => (
+              <NavigationMenuItem key={link.href}>
+                <NavigationMenuLink
+                  className={`${navigationMenuTriggerStyle()} ${NAV_ITEM_CLASS}`}
+                  render={<a href={link.href} />}
+                >
+                  {link.label}
+                </NavigationMenuLink>
+              </NavigationMenuItem>
+            ))}
           </NavigationMenuList>
         </NavigationMenu>
         <div className="hidden items-center gap-4 lg:flex">
@@ -177,25 +178,27 @@ export function LandingNavbar() {
               {[
                 { title: "Product", links: PRODUCT_LINKS },
                 { title: "Developers", links: DEVELOPER_LINKS },
-                { title: "Company", links: [PRICING_LINK] },
-              ].map((group) => (
-                <div className="flex flex-col gap-4" key={group.title}>
-                  <div className="font-sans text-zinc-500 text-xs/4 tracking-[-0.01em]">
-                    {group.title}
+                { title: "Company", links: MARKETING_COMPANY_LINKS },
+              ]
+                .filter((group) => group.links.length > 0)
+                .map((group) => (
+                  <div className="flex flex-col gap-4" key={group.title}>
+                    <div className="font-sans text-zinc-500 text-xs/4 tracking-[-0.01em]">
+                      {group.title}
+                    </div>
+                    {group.links.map((link) => (
+                      <SheetClose asChild key={link.href}>
+                        <a
+                          className="flex items-center gap-3 font-sans text-zinc-200 text-base tracking-[-0.02em] transition-colors hover:text-white"
+                          href={link.href}
+                        >
+                          <link.icon className="size-4 shrink-0 text-zinc-500" />
+                          {link.label}
+                        </a>
+                      </SheetClose>
+                    ))}
                   </div>
-                  {group.links.map((link) => (
-                    <SheetClose asChild key={link.href}>
-                      <a
-                        className="flex items-center gap-3 font-sans text-zinc-200 text-base tracking-[-0.02em] transition-colors hover:text-white"
-                        href={link.href}
-                      >
-                        <link.icon className="size-4 shrink-0 text-zinc-500" />
-                        {link.label}
-                      </a>
-                    </SheetClose>
-                  ))}
-                </div>
-              ))}
+                ))}
             </nav>
             <div className="mt-auto flex flex-col gap-3 px-6 pb-8">
               <Button asChild size="lg" variant="outline">
diff --git a/apps/www/src/features/www/pricing/plans.ts b/apps/www/src/features/www/pricing/plans.ts
deleted file mode 100644
index 971b056bf..000000000
--- a/apps/www/src/features/www/pricing/plans.ts
+++ /dev/null
@@ -1,237 +0,0 @@
-import { signUpCtaLabel } from "@/lib/waitlist";
-
-import {
-  EVENTS_METER,
-  formatRate,
-  formatUsd,
-  GROW_BASE_PRICE,
-  TRACKED_REVENUE_METER,
-} from "./pricing-model";
-
-export type PlanId = "free" | "grow" | "enterprise";
-
-export type Plan = {
-  readonly id: PlanId;
-  readonly name: string;
-  /** Headline figure, already formatted — `$0`, `$29.99`, `Custom`. */
-  readonly price: string;
-  /** Qualifier printed next to the figure, e.g. `/ month`. */
-  readonly priceSuffix?: string;
-  /** Small line above the figure that sets expectations before the number lands. */
-  readonly priceNote: string;
-  readonly description: string;
-  readonly cta: { readonly label: string; readonly href: string };
-  readonly highlights: readonly string[];
-};
-
-export const PLANS: readonly Plan[] = [
-  {
-    cta: { href: "/auth/sign-up", label: signUpCtaLabel("Start for free") },
-    description:
-      "Everything in the platform, metered small. Enough to ship a paywall and watch it convert.",
-    highlights: [
-      `${TRACKED_REVENUE_METER.formatVolume(TRACKED_REVENUE_METER.freeAllowance)} tracked revenue per month`,
-      `${EVENTS_METER.formatVolume(EVENTS_METER.freeAllowance)} events per month`,
-      "Unlimited paywalls, flags and experiments",
-      "Unlimited team members and API calls",
-      "Community support on Discord",
-    ],
-    id: "free",
-    name: "Free",
-    price: "$0",
-    priceNote: "No credit card, ever",
-    priceSuffix: "/ month",
-  },
-  {
-    cta: { href: "/auth/sign-up", label: signUpCtaLabel("Start with Grow") },
-    description:
-      "For apps with real revenue. A generous allowance, then you only pay for what you use.",
-    highlights: [
-      `${TRACKED_REVENUE_METER.formatVolume(TRACKED_REVENUE_METER.growAllowance)} tracked revenue included, then ${formatRate(TRACKED_REVENUE_METER.rate)} per ${TRACKED_REVENUE_METER.unitLabel}`,
-      `${EVENTS_METER.formatVolume(EVENTS_METER.growAllowance)} events included, then ${formatRate(EVENTS_METER.rate)} per ${EVENTS_METER.unitLabel}`,
-      "One flat rate per meter — no tiers to work out",
-      "5+ years of data retention",
-      "Email support with a 1 business day reply",
-    ],
-    id: "grow",
-    name: "Grow",
-    price: formatUsd(GROW_BASE_PRICE),
-    priceNote: "Starting from",
-    priceSuffix: "/ month",
-  },
-  {
-    cta: { href: "mailto:sales@voidhash.com?subject=Voidhash%20Enterprise", label: "Talk to us" },
-    description:
-      "For teams that need volume pricing, a contract, and someone to call when it matters.",
-    highlights: [
-      "Committed-use discounts on both meters",
-      "SSO/SAML, SCIM and audit logs",
-      "Supported self-hosting and BYOC deployments",
-      "99.9% uptime SLA and priority routing",
-      "Shared Slack channel and migration help",
-    ],
-    id: "enterprise",
-    name: "Enterprise",
-    price: "Custom",
-    priceNote: "Annual contract",
-  },
-];
-
-/** A matrix cell: `true`/`false` render as a mark, a string renders verbatim. */
-export type MatrixValue = boolean | string;
-
-export type MatrixRow = {
-  readonly label: string;
-  /** Optional clarifier shown under the label for rows whose wording is load-bearing. */
-  readonly detail?: string;
-  /**
-   * Keeps a row out of the rendered matrix without deleting it.
-   *
-   * Used for capabilities that are planned but not shipped — drop the flag to publish the row
-   * once the feature is real.
-   */
-  readonly hidden?: boolean;
-  readonly free: MatrixValue;
-  readonly grow: MatrixValue;
-  readonly enterprise: MatrixValue;
-};
-
-export type MatrixGroup = {
-  readonly title: string;
-  readonly rows: readonly MatrixRow[];
-};
-
-export const MATRIX: readonly MatrixGroup[] = [
-  {
-    rows: [
-      {
-        detail: "Revenue Voidhash validates and attributes for you.",
-        enterprise: "Custom",
-        free: "$1,000 / month",
-        grow: "$10,000 / month, then $8 per $1,000",
-        label: "Tracked revenue",
-      },
-      {
-        detail: "Screen views, impressions, purchases — anything the SDK sends.",
-        enterprise: "Custom",
-        free: "50K / month",
-        grow: "1M / month, then $6 per 100K",
-        label: "Events",
-      },
-      { enterprise: "Unlimited", free: "Unlimited", grow: "Unlimited", label: "Active persons" },
-      {
-        enterprise: "Unlimited",
-        free: "Unlimited",
-        grow: "Unlimited",
-        label: "Paywall conversions",
-      },
-      { enterprise: "Unlimited", free: "Unlimited", grow: "Unlimited", label: "API calls" },
-      {
-        detail: "Tool calls made by AI agents through the Voidhash MCP server.",
-        enterprise: "Custom",
-        free: "400 / month",
-        grow: "8M / month",
-        label: "MCP tool calls",
-      },
-      { enterprise: "Unlimited", free: "Unlimited", grow: "Unlimited", label: "Apps and projects" },
-      { enterprise: "Unlimited", free: "Unlimited", grow: "Unlimited", label: "Team members" },
-      { enterprise: "Custom", free: "3 years", grow: "5+ years", label: "Data retention" },
-    ],
-    title: "Usage",
-  },
-  {
-    rows: [
-      { enterprise: true, free: true, grow: true, label: "No-code paywall designer" },
-      { enterprise: true, free: true, grow: true, label: "AI paywall generation" },
-      {
-        detail: "Publish a new paywall without shipping a build.",
-        enterprise: true,
-        free: true,
-        grow: true,
-        label: "Remote updates",
-      },
-      { enterprise: true, free: true, grow: true, label: "Templates and component library" },
-      { enterprise: true, free: true, grow: true, label: "Custom fonts and image assets" },
-      { enterprise: true, free: true, grow: true, label: "Localization" },
-      { enterprise: true, free: true, grow: true, label: "Placements and targeting" },
-    ],
-    title: "Paywalls",
-  },
-  {
-    rows: [
-      { enterprise: true, free: true, grow: true, label: "Revenue, trial and churn dashboards" },
-      { enterprise: true, free: true, grow: true, label: "Funnels, cohorts and retention" },
-      { enterprise: true, free: true, grow: true, label: "Store and network attribution" },
-      { enterprise: true, free: false, grow: true, label: "SQL access to your raw events" },
-    ],
-    title: "Analytics",
-  },
-  {
-    rows: [
-      { enterprise: true, free: true, grow: true, label: "Feature flags" },
-      { enterprise: true, free: true, grow: true, label: "Paywall and price A/B tests" },
-      { enterprise: true, free: true, grow: true, label: "Audience targeting and rollouts" },
-      {
-        enterprise: true,
-        free: false,
-        grow: true,
-        hidden: true,
-        label: "Statistical significance reporting",
-      },
-    ],
-    title: "Experimentation",
-  },
-  {
-    rows: [
-      { enterprise: true, free: true, grow: true, label: "Unified person profiles" },
-      { enterprise: true, free: true, grow: true, label: "Cross-device identity resolution" },
-      { enterprise: true, free: true, grow: true, label: "Segments and saved views" },
-      { enterprise: true, free: true, grow: true, label: "Webhooks" },
-    ],
-    title: "CRM",
-  },
-  {
-    rows: [
-      { enterprise: true, free: true, grow: true, label: "React Native, iOS and Android SDKs" },
-      { enterprise: true, free: true, grow: true, label: "REST API, CLI and MCP server" },
-      { enterprise: true, free: true, grow: true, label: "Self-hosting (open source)" },
-      { enterprise: true, free: false, grow: false, label: "SSO/SAML, SCIM and audit log" },
-      { enterprise: "99.9% SLA", free: false, grow: false, label: "Uptime SLA" },
-      { enterprise: "Shared Slack", free: "Community", grow: "Email", label: "Support" },
-    ],
-    title: "Platform",
-  },
-];
-
-export const FAQ: readonly { readonly question: string; readonly answer: string }[] = [
-  {
-    answer:
-      "No. The Free plan needs no card and never converts into a paid one on its own. If you outgrow the included allowance we pause ingestion until the next month rather than billing you by surprise.",
-    question: "Do I need a credit card to start?",
-  },
-  {
-    answer:
-      "Tracked revenue is the subscription and one-off revenue Voidhash validates, attributes and reports on in a given month — not your app's total revenue. Purchases that never touch Voidhash are never metered.",
-    question: "What counts as tracked revenue?",
-  },
-  {
-    answer:
-      "One flat rate per meter, charged only on what you use past the allowance included in your plan. There are no tiers, no bands and no minimums to work out — $8 per $1,000 of tracked revenue and $6 per 100,000 events, whatever your scale.",
-    question: "How does the usage pricing work?",
-  },
-  {
-    answer:
-      "Your allowance resets on the first of each month and unused volume does not roll over. Usage is billed in arrears, so the invoice at the end of a month reflects exactly what you sent.",
-    question: "When does my allowance reset?",
-  },
-  {
-    answer:
-      "Yes. Voidhash is open source and you can run the whole platform yourself — no meters, no invoices. Enterprise adds support, migration help and an SLA on top of a self-hosted deployment.",
-    question: "Can I self-host instead?",
-  },
-  {
-    answer:
-      "Set a spend cap in the billing settings and we will alert you as you approach it, then stop ingesting once it is reached. You will never receive an invoice larger than the cap you set.",
-    question: "Can I cap my spend?",
-  },
-];
diff --git a/apps/www/src/features/www/pricing/pricing-model.ts b/apps/www/src/features/www/pricing/pricing-model.ts
deleted file mode 100644
index f1817c827..000000000
--- a/apps/www/src/features/www/pricing/pricing-model.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * Single source of truth for everything the pricing page quotes.
- *
- * The two metered features mirror the billing catalog (`tracked_revenue` and `events`); every
- * other entitlement is unlimited on all plans and is therefore only ever rendered as copy.
- */
-
-/** Monthly base fee of the Grow plan, before any usage. */
-export const GROW_BASE_PRICE = 29.99;
-
-export type Meter = {
-  readonly id: "trackedRevenue" | "events";
-  readonly label: string;
-  /** Short sentence explaining what the meter actually counts. */
-  readonly description: string;
-  /** How many meter units one `rate` charge covers. */
-  readonly billingUnit: number;
-  /** Renders one billing unit for the rate line, e.g. `100K events`. */
-  readonly unitLabel: string;
-  /** Flat price per `billingUnit` once the Grow allowance is used up. */
-  readonly rate: number;
-  /** Volume included on Free. Going past it is what moves you onto Grow. */
-  readonly freeAllowance: number;
-  /** Volume included in the Grow base fee. */
-  readonly growAllowance: number;
-  /**
-   * Smallest non-zero volume the slider can land on.
-   *
-   * The track is logarithmic and so cannot express zero, which is where every slider starts —
-   * the calculator reserves its first step for a literal 0 and scales from this floor upwards.
-   */
-  readonly sliderFloor: number;
-  readonly sliderMax: number;
-  /** Renders a raw volume for display, e.g. `1.2M` or `$25K`. */
-  readonly formatVolume: (value: number) => string;
-};
-
-const compact = new Intl.NumberFormat("en-US", {
-  maximumFractionDigits: 1,
-  notation: "compact",
-});
-
-/** Formats an invoice figure. Always two decimals, so a column of them lines up. */
-export function formatUsd(value: number): string {
-  return value.toLocaleString("en-US", {
-    currency: "USD",
-    maximumFractionDigits: 2,
-    minimumFractionDigits: 2,
-    style: "currency",
-  });
-}
-
-/** Formats a per-unit rate the way a price list reads it — `$6`, `$4.50` — never `$6.00`. */
-export function formatRate(value: number): string {
-  const cents = value % 1 === 0 ? 0 : 2;
-  return value.toLocaleString("en-US", {
-    currency: "USD",
-    maximumFractionDigits: cents,
-    minimumFractionDigits: cents,
-    style: "currency",
-  });
-}
-
-/** Compact dollars, but spelled out below the point where `$1K` starts reading as a rounding. */
-function formatDollarVolume(value: number): string {
-  return value < 10_000 ? `$${value.toLocaleString("en-US")}` : `$${compact.format(value)}`;
-}
-
-export const TRACKED_REVENUE_METER: Meter = {
-  billingUnit: 1_000,
-  description:
-    "Subscription and one-off revenue Voidhash validates, attributes and reports on each month.",
-  formatVolume: formatDollarVolume,
-  freeAllowance: 1_000,
-  growAllowance: 10_000,
-  id: "trackedRevenue",
-  label: "Tracked revenue",
-  rate: 8,
-  sliderFloor: 100,
-  sliderMax: 10_000_000,
-  unitLabel: "$1,000 tracked",
-};
-
-export const EVENTS_METER: Meter = {
-  billingUnit: 100_000,
-  description: "Anything your SDK sends us — screen views, paywall impressions, purchases, taps.",
-  formatVolume: (value) => compact.format(value),
-  freeAllowance: 50_000,
-  growAllowance: 1_000_000,
-  id: "events",
-  label: "Events",
-  rate: 6,
-  sliderFloor: 10_000,
-  sliderMax: 500_000_000,
-  unitLabel: "100K events",
-};
-
-/** Prices a monthly volume: everything past the Grow allowance at one flat rate. */
-export function meterCost(meter: Meter, volume: number): number {
-  const billable = Math.max(0, volume - meter.growAllowance);
-  return (billable / meter.billingUnit) * meter.rate;
-}
-
-export type Estimate = {
-  /** Which plan the quoted volumes actually land you on. */
-  readonly plan: "free" | "grow";
-  readonly base: number;
-  readonly trackedRevenue: number;
-  readonly events: number;
-  readonly total: number;
-};
-
-/**
- * Prices a month at the given volumes.
- *
- * Volumes that fit inside the Free allowances cost nothing at all — the base fee only applies
- * once you have outgrown Free on at least one meter.
- */
-export function estimate(revenueVolume: number, eventVolume: number): Estimate {
-  const fitsOnFree =
-    revenueVolume <= TRACKED_REVENUE_METER.freeAllowance &&
-    eventVolume <= EVENTS_METER.freeAllowance;
-
-  if (fitsOnFree) {
-    return { base: 0, events: 0, plan: "free", total: 0, trackedRevenue: 0 };
-  }
-
-  const trackedRevenue = meterCost(TRACKED_REVENUE_METER, revenueVolume);
-  const events = meterCost(EVENTS_METER, eventVolume);
-
-  return {
-    base: GROW_BASE_PRICE,
-    events,
-    plan: "grow",
-    total: GROW_BASE_PRICE + trackedRevenue + events,
-    trackedRevenue,
-  };
-}
diff --git a/apps/www/src/features/www/pricing/pricing-page.tsx b/apps/www/src/features/www/pricing/pricing-page.tsx
deleted file mode 100644
index c20cb6f78..000000000
--- a/apps/www/src/features/www/pricing/pricing-page.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-"use client";
-
-import { LandingAsteroids } from "@/features/www/landing/sections/asteroids";
-import { LandingDivider } from "@/features/www/landing/sections/divider";
-import { LandingFooter } from "@/features/www/landing/sections/footer";
-import { LandingGetStarted } from "@/features/www/landing/sections/get-started";
-import { LandingNavbar } from "@/features/www/landing/sections/navbar";
-
-import { PricingCalculator } from "./sections/calculator";
-import { PricingFaq } from "./sections/faq";
-import { PricingHero } from "./sections/hero";
-import { PricingMatrix } from "./sections/matrix";
-import { PricingPlans } from "./sections/plans";
-
-/** Renders the Voidhash pricing page. */
-export function PricingPage() {
-  return (
-    <div className="dark w-full overflow-x-clip bg-zinc-950 text-xs/4 antialiased [font-synthesis:none]">
-      <LandingNavbar />
-      <div className="flex w-full flex-col items-start gap-px">
-        <PricingHero />
-        <PricingPlans />
-        <LandingDivider />
-        <PricingCalculator />
-        <LandingDivider />
-        <PricingMatrix />
-        <LandingDivider />
-        <PricingFaq />
-        <LandingDivider />
-        <LandingGetStarted />
-        <LandingDivider />
-        <LandingFooter />
-        <LandingAsteroids />
-      </div>
-    </div>
-  );
-}
diff --git a/apps/www/src/features/www/pricing/sections/calculator.tsx b/apps/www/src/features/www/pricing/sections/calculator.tsx
deleted file mode 100644
index 3a2e3ae31..000000000
--- a/apps/www/src/features/www/pricing/sections/calculator.tsx
+++ /dev/null
@@ -1,259 +0,0 @@
-"use client";
-
-import { Button, cn, Slider } from "@voidhash/ui";
-import { useMemo, useState } from "react";
-
-import { LandingSection, SectionHeader } from "@/features/www/landing/shared";
-import { signUpCtaLabel } from "@/lib/waitlist";
-
-import {
-  estimate,
-  EVENTS_METER,
-  formatRate,
-  formatUsd,
-  type Meter,
-  TRACKED_REVENUE_METER,
-} from "../pricing-model";
-
-/** Same panel treatment as the landing product cards. */
-const PANEL_BACKGROUND =
-  "radial-gradient(ellipse 100% 100% at 0% 0% in oklab, var(--color-zinc-900) 0%, var(--color-zinc-950) 100%)";
-
-/**
- * Slider resolution. Step 0 is reserved for a volume of zero and the remaining steps carry the
- * logarithmic ramp, so every slider has a real "nothing yet" position at its left edge.
- */
-const SLIDER_STEPS = 1000;
-
-/** Rounds to two significant figures so dragging lands on 3.2M rather than 3,184,721. */
-function roundToTwoSignificantFigures(value: number): number {
-  const magnitude = 10 ** Math.max(0, Math.floor(Math.log10(value)) - 1);
-  return Math.round(value / magnitude) * magnitude;
-}
-
-function positionToVolume(meter: Meter, position: number): number {
-  if (position <= 0) {
-    return 0;
-  }
-  const ratio = meter.sliderMax / meter.sliderFloor;
-  const progress = (position - 1) / (SLIDER_STEPS - 1);
-  return roundToTwoSignificantFigures(meter.sliderFloor * ratio ** progress);
-}
-
-function volumeToPosition(meter: Meter, volume: number): number {
-  if (volume <= 0) {
-    return 0;
-  }
-  const ratio = meter.sliderMax / meter.sliderFloor;
-  const clamped = Math.min(meter.sliderMax, Math.max(meter.sliderFloor, volume));
-  return 1 + (Math.log(clamped / meter.sliderFloor) / Math.log(ratio)) * (SLIDER_STEPS - 1);
-}
-
-function RateRow({ label, value }: { label: string; value: string }) {
-  return (
-    <div className="flex items-center justify-between gap-4 border-zinc-900 border-b py-2.5 last:border-b-0">
-      <div className="font-sans text-[13px]/4 text-zinc-400 tracking-[-0.01em]">{label}</div>
-      <div className="font-mono text-[13px]/4 text-white">{value}</div>
-    </div>
-  );
-}
-
-function VolumeInput({
-  meter,
-  onChange,
-  value,
-}: {
-  meter: Meter;
-  onChange: (value: number) => void;
-  value: number;
-}) {
-  const [draft, setDraft] = useState<string | null>(null);
-  const dollars = meter.id === "trackedRevenue";
-
-  const commit = () => {
-    const cleaned = (draft ?? "").replace(/[^\d]/g, "");
-    if (cleaned !== "") {
-      onChange(Math.min(meter.sliderMax, Number(cleaned)));
-    }
-    setDraft(null);
-  };
-
-  return (
-    <div className="flex items-baseline gap-1">
-      {dollars ? (
-        <span className="font-medium font-sans text-[28px] text-white leading-none tracking-[-0.03em]">
-          $
-        </span>
-      ) : null}
-      <input
-        aria-label={`Monthly ${meter.label.toLowerCase()}`}
-        className="w-full min-w-0 bg-transparent font-medium font-sans text-[28px] text-white leading-none tracking-[-0.03em] outline-none focus:text-blue-ribbon-300"
-        inputMode="numeric"
-        onBlur={commit}
-        onChange={(event) => setDraft(event.target.value)}
-        onKeyDown={(event) => {
-          if (event.key === "Enter") {
-            event.currentTarget.blur();
-          }
-        }}
-        value={draft ?? value.toLocaleString("en-US")}
-      />
-    </div>
-  );
-}
-
-function MeterControl({
-  meter,
-  onChange,
-  value,
-}: {
-  meter: Meter;
-  onChange: (value: number) => void;
-  value: number;
-}) {
-  return (
-    <div className="flex flex-col gap-6">
-      <div className="flex flex-col gap-2">
-        <div className="font-medium font-sans text-white text-[15px]/4.5 tracking-[-0.02em]">
-          {meter.label}
-        </div>
-        <p className="max-w-[420px] font-sans text-[13px]/4.5 text-zinc-400 tracking-[-0.01em]">
-          {meter.description}
-        </p>
-      </div>
-      <div className="flex flex-col gap-4">
-        <VolumeInput meter={meter} onChange={onChange} value={value} />
-        <Slider
-          aria-label={`Monthly ${meter.label.toLowerCase()} slider`}
-          max={SLIDER_STEPS}
-          min={0}
-          onValueChange={([position]) => onChange(positionToVolume(meter, position))}
-          step={1}
-          value={[volumeToPosition(meter, value)]}
-        />
-        <div className="flex items-center justify-between font-sans text-xs/4 text-zinc-500">
-          <span>{meter.formatVolume(0)}</span>
-          <span>{meter.formatVolume(meter.sliderMax)}</span>
-        </div>
-      </div>
-      <div className="flex flex-col">
-        <RateRow label="Included on Free" value={meter.formatVolume(meter.freeAllowance)} />
-        <RateRow label="Included on Grow" value={meter.formatVolume(meter.growAllowance)} />
-        <RateRow
-          label="Every unit after that"
-          value={`${formatRate(meter.rate)} / ${meter.unitLabel}`}
-        />
-      </div>
-    </div>
-  );
-}
-
-function SummaryRow({
-  amount,
-  detail,
-  label,
-  muted,
-}: {
-  amount: string;
-  detail?: string;
-  label: string;
-  muted: boolean;
-}) {
-  return (
-    <div className="flex items-start justify-between gap-6 border-zinc-900 border-b px-6 py-4.5">
-      <div className="flex flex-col gap-1">
-        <div className="font-sans text-[15px]/4.5 text-zinc-200 tracking-[-0.02em]">{label}</div>
-        {detail ? (
-          <div className="font-sans text-xs/4 text-zinc-500 tracking-[-0.01em]">{detail}</div>
-        ) : null}
-      </div>
-      <div
-        className={cn(
-          "shrink-0 font-medium font-mono text-[15px]/4.5",
-          muted ? "text-zinc-500" : "text-white",
-        )}
-      >
-        {amount}
-      </div>
-    </div>
-  );
-}
-
-/** Renders the interactive monthly bill estimator. */
-export function PricingCalculator() {
-  // Both meters start at zero, so the first thing anyone sees is a $0 bill.
-  const [revenue, setRevenue] = useState(0);
-  const [events, setEvents] = useState(0);
-
-  const bill = useMemo(() => estimate(revenue, events), [revenue, events]);
-  const onFree = bill.plan === "free";
-
-  return (
-    <LandingSection id="calculator">
-      <div className="flex flex-col items-start gap-12 px-6 py-16 md:gap-16 md:px-12 md:py-24 xl:p-32">
-        <SectionHeader
-          description="Drag the two meters to your own numbers. No sales call needed to find out what Voidhash costs."
-          eyebrow="Estimate"
-          title="Work out your bill before you commit."
-        />
-        <div className="flex w-full flex-col items-start gap-10 xl:flex-row xl:gap-16">
-          <div className="flex w-full min-w-0 flex-col gap-12 xl:flex-1">
-            <MeterControl meter={TRACKED_REVENUE_METER} onChange={setRevenue} value={revenue} />
-            <MeterControl meter={EVENTS_METER} onChange={setEvents} value={events} />
-          </div>
-          <div
-            className="flex w-full flex-col overflow-clip rounded-lg border border-zinc-800 border-solid xl:w-107.25 xl:shrink-0"
-            style={{ backgroundImage: PANEL_BACKGROUND }}
-          >
-            <div className="flex items-center justify-between border-zinc-800 border-b px-6 py-5">
-              <div className="font-medium font-sans text-[15px]/4.5 text-white tracking-[-0.02em]">
-                Your monthly bill
-              </div>
-              <div className="font-sans text-xs/4 text-zinc-400">
-                {onFree ? "Free plan" : "Grow plan"}
-              </div>
-            </div>
-            <SummaryRow
-              amount={formatUsd(bill.base)}
-              detail="Platform access"
-              label="Base"
-              muted={onFree}
-            />
-            <SummaryRow
-              amount={formatUsd(bill.trackedRevenue)}
-              detail={`${TRACKED_REVENUE_METER.formatVolume(revenue)} tracked`}
-              label="Tracked revenue"
-              muted={bill.trackedRevenue === 0}
-            />
-            <SummaryRow
-              amount={formatUsd(bill.events)}
-              detail={`${EVENTS_METER.formatVolume(events)} events`}
-              label="Events"
-              muted={bill.events === 0}
-            />
-            <div className="flex flex-col gap-5 px-6 py-6.5">
-              <div className="flex items-end justify-between gap-4">
-                <div className="font-sans text-[15px]/4.5 text-zinc-200 tracking-[-0.02em]">
-                  Estimated total
-                </div>
-                <div className="font-medium font-sans text-[32px] text-white leading-none tracking-[-0.03em]">
-                  {formatUsd(bill.total)}
-                </div>
-              </div>
-              <p className="font-sans text-[13px]/4.5 text-zinc-400 tracking-[-0.01em]">
-                {onFree
-                  ? "At this volume you fit inside the Free plan — no card, nothing to pay."
-                  : revenue > 0
-                    ? `That works out to ${((bill.total / revenue) * 100).toFixed(2)}% of the revenue we track for you.`
-                    : "Billed monthly in arrears. Change plan or cancel at any time."}
-              </p>
-              <Button asChild className="w-full" size="lg">
-                <a href="/auth/sign-up">{signUpCtaLabel("Start for free")}</a>
-              </Button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </LandingSection>
-  );
-}
diff --git a/apps/www/src/features/www/pricing/sections/faq.tsx b/apps/www/src/features/www/pricing/sections/faq.tsx
deleted file mode 100644
index 2068f2543..000000000
--- a/apps/www/src/features/www/pricing/sections/faq.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@voidhash/ui";
-
-import { LandingSection, SectionHeader } from "@/features/www/landing/shared";
-
-import { FAQ } from "../plans";
-
-/** Renders the pricing FAQ. */
-export function PricingFaq() {
-  return (
-    <LandingSection>
-      <div className="flex flex-col gap-12 px-6 py-16 md:px-12 md:py-24 lg:flex-row lg:gap-24 xl:p-32">
-        <div className="w-full lg:w-90 lg:shrink-0">
-          <SectionHeader eyebrow="Questions" title="The things people ask us first." />
-        </div>
-        <Accordion className="min-w-0 flex-1 border-zinc-800 border-t" collapsible type="single">
-          {FAQ.map((entry) => (
-            <AccordionItem
-              className="border-zinc-800 last:border-b"
-              key={entry.question}
-              value={entry.question}
-            >
-              <AccordionTrigger className="py-5 font-medium font-sans text-[17px]/6 text-white tracking-[-0.02em] hover:no-underline">
-                {entry.question}
-              </AccordionTrigger>
-              <AccordionContent className="max-w-[720px] pb-5 font-sans text-[15px]/6.5 text-zinc-400 tracking-[-0.01em]">
-                {entry.answer}
-              </AccordionContent>
-            </AccordionItem>
-          ))}
-        </Accordion>
-      </div>
-    </LandingSection>
-  );
-}
diff --git a/apps/www/src/features/www/pricing/sections/hero.tsx b/apps/www/src/features/www/pricing/sections/hero.tsx
deleted file mode 100644
index d9b995423..000000000
--- a/apps/www/src/features/www/pricing/sections/hero.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { HeroShader } from "@/features/www/hero/hero-shader";
-import { LandingSection } from "@/features/www/landing/shared";
-
-/** Renders the pricing page hero, backed by the same lenticular shader as the landing hero. */
-export function PricingHero() {
-  return (
-    <LandingSection>
-      <div className="relative flex flex-col items-center overflow-clip px-6 py-24 md:py-32 xl:py-40">
-        <div className="absolute inset-0">
-          <HeroShader />
-        </div>
-        <div className="relative flex w-full max-w-[826px] flex-col items-center gap-6">
-          <h1 className="text-balance text-center font-medium font-sans text-[40px] text-white leading-[110%] tracking-[-0.03em] md:text-[56px]">
-            Pricing that starts at zero and scales with you
-          </h1>
-          <p className="max-w-[600px] text-center font-sans text-zinc-400 text-base/6.5 tracking-[-0.03em] md:text-xl/8">
-            Every plan includes the whole platform. You only ever pay for the revenue we track and
-            the events we ingest for you.
-          </p>
-        </div>
-      </div>
-    </LandingSection>
-  );
-}
diff --git a/apps/www/src/features/www/pricing/sections/matrix.tsx b/apps/www/src/features/www/pricing/sections/matrix.tsx
deleted file mode 100644
index bc5938621..000000000
--- a/apps/www/src/features/www/pricing/sections/matrix.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import { cn } from "@voidhash/ui";
-import { CheckIcon, MinusIcon } from "lucide-react";
-
-import { LandingSection, SectionHeader } from "@/features/www/landing/shared";
-
-import { MATRIX, type MatrixValue, PLANS } from "../plans";
-
-/**
- * Height of the sticky navbar the header row has to clear: 32px of controls plus its padding
- * (`p-4` on mobile, `p-6` from `md`) and the hairline underneath.
- */
-const HEADER_OFFSET = "top-[65px] md:top-[81px]";
-
-/** Shared column geometry, so the header row and every body row land in the same lanes. */
-const ROW = "flex items-stretch gap-4 px-6 md:px-12 xl:px-32";
-
-/** The matrix minus rows for capabilities we have not shipped, and any group left empty by that. */
-const VISIBLE_MATRIX = MATRIX.map((group) => ({
-  ...group,
-  rows: group.rows.filter((row) => !row.hidden),
-})).filter((group) => group.rows.length > 0);
-const LABEL_CELL = "flex-1 min-w-0 py-4";
-const VALUE_CELL = "w-32 shrink-0 py-4 md:w-40";
-
-function Cell({ value }: { value: MatrixValue }) {
-  if (value === true) {
-    return <CheckIcon className="size-4 text-zinc-200" />;
-  }
-  if (value === false) {
-    return <MinusIcon className="size-4 text-zinc-700" />;
-  }
-  return (
-    <div className="font-sans text-[13px]/4.5 text-zinc-200 tracking-[-0.01em]">{value}</div>
-  );
-}
-
-/** Renders the plan comparison matrix. */
-export function PricingMatrix() {
-  return (
-    <LandingSection id="compare">
-      <div className="flex flex-col items-start gap-12 px-6 pt-16 md:gap-16 md:px-12 md:pt-24 xl:px-32 xl:pt-32">
-        <SectionHeader
-          description="Every plan ships the whole product. What changes is how much you can send us, and how much help you get."
-          eyebrow="Compare"
-          title="One platform, three ways to buy it."
-        />
-      </div>
-      <div className="mt-12 overflow-x-auto md:mt-16 lg:overflow-x-visible">
-        <div className="min-w-[840px] lg:min-w-0">
-          <div
-            className={cn(
-              ROW,
-              HEADER_OFFSET,
-              "sticky z-10 items-end border-zinc-800 border-y bg-zinc-950/95 backdrop-blur-md",
-            )}
-          >
-            <div className={cn(LABEL_CELL, "font-sans text-xs/4 text-zinc-500")}>Feature</div>
-            {PLANS.map((plan) => (
-              <div
-                className={cn(
-                  VALUE_CELL,
-                  "font-medium font-sans text-sm/4.5 tracking-[-0.02em]",
-                  plan.id === "grow" ? "text-white" : "text-zinc-300",
-                )}
-                key={plan.id}
-              >
-                {plan.name}
-              </div>
-            ))}
-          </div>
-          {VISIBLE_MATRIX.map((group) => (
-            <div key={group.title}>
-              <div
-                className={cn(
-                  ROW,
-                  "border-zinc-800 border-b bg-zinc-900/30 py-3",
-                  "font-medium font-sans text-[13px]/4.5 text-zinc-400 tracking-[-0.01em]",
-                )}
-              >
-                {group.title}
-              </div>
-              {group.rows.map((row) => (
-                <div className={cn(ROW, "border-zinc-900 border-b")} key={row.label}>
-                  <div className={cn(LABEL_CELL, "flex flex-col gap-1")}>
-                    <div className="font-sans text-sm/4.5 text-zinc-200 tracking-[-0.01em]">
-                      {row.label}
-                    </div>
-                    {row.detail ? (
-                      <div className="max-w-[420px] font-sans text-xs/4 text-zinc-500 tracking-[-0.01em]">
-                        {row.detail}
-                      </div>
-                    ) : null}
-                  </div>
-                  <div className={VALUE_CELL}>
-                    <Cell value={row.free} />
-                  </div>
-                  <div className={VALUE_CELL}>
-                    <Cell value={row.grow} />
-                  </div>
-                  <div className={VALUE_CELL}>
-                    <Cell value={row.enterprise} />
-                  </div>
-                </div>
-              ))}
-            </div>
-          ))}
-        </div>
-      </div>
-    </LandingSection>
-  );
-}
diff --git a/apps/www/src/features/www/pricing/sections/plans.tsx b/apps/www/src/features/www/pricing/sections/plans.tsx
deleted file mode 100644
index 6ce139396..000000000
--- a/apps/www/src/features/www/pricing/sections/plans.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Button, cn } from "@voidhash/ui";
-import { CheckIcon } from "lucide-react";
-
-import { LandingSection } from "@/features/www/landing/shared";
-
-import { type Plan, PLANS } from "../plans";
-import { PricingSelfHost } from "./self-host";
-
-/** Lifts the recommended column off the flat surface without boxing it in a card. */
-const HIGHLIGHT_BACKGROUND =
-  "radial-gradient(ellipse 100% 100% at 50% 0% in oklab, var(--color-zinc-900) 0%, var(--color-zinc-950) 100%)";
-
-function PlanColumn({ plan }: { plan: Plan }) {
-  const recommended = plan.id === "grow";
-
-  return (
-    <div
-      className="flex flex-col gap-8 px-6 py-12 md:px-10 md:py-14"
-      style={recommended ? { backgroundImage: HIGHLIGHT_BACKGROUND } : undefined}
-    >
-      <div className="flex flex-col gap-6">
-        <div className="font-medium font-sans text-white text-xl leading-[120%] tracking-[-0.02em]">
-          {plan.name}
-        </div>
-        <div className="flex flex-col gap-2">
-          <div className="font-sans text-zinc-500 text-[13px]/4 tracking-[-0.01em]">
-            {plan.priceNote}
-          </div>
-          <div className="flex items-baseline gap-2">
-            <div className="font-medium font-sans text-[44px] text-white leading-[110%] tracking-[-0.03em]">
-              {plan.price}
-            </div>
-            {plan.priceSuffix ? (
-              <div className="font-sans text-[15px]/5 text-zinc-400 tracking-[-0.01em]">
-                {plan.priceSuffix}
-              </div>
-            ) : null}
-          </div>
-        </div>
-        <p className="min-h-16 max-w-[360px] font-sans text-[15px]/6 text-zinc-400 tracking-[-0.01em]">
-          {plan.description}
-        </p>
-        <Button
-          asChild
-          className="w-full"
-          size="lg"
-          variant={recommended ? "default" : "outline"}
-        >
-          <a href={plan.cta.href}>{plan.cta.label}</a>
-        </Button>
-      </div>
-      <div className="flex flex-col gap-3.5 border-zinc-800 border-t pt-8">
-        {plan.highlights.map((highlight) => (
-          <div className="flex items-start gap-3" key={highlight}>
-            <CheckIcon
-              className={cn(
-                "mt-0.5 size-4 shrink-0",
-                recommended ? "text-blue-ribbon-400" : "text-zinc-500",
-              )}
-            />
-            <div className="font-sans text-[15px]/5.5 text-zinc-200 tracking-[-0.01em]">
-              {highlight}
-            </div>
-          </div>
-        ))}
-      </div>
-    </div>
-  );
-}
-
-/** Renders the three plan columns. */
-export function PricingPlans() {
-  return (
-    <LandingSection>
-      <div className="grid grid-cols-1 divide-y divide-zinc-800 lg:grid-cols-3 lg:divide-x lg:divide-y-0">
-        {PLANS.map((plan) => (
-          <PlanColumn key={plan.id} plan={plan} />
-        ))}
-      </div>
-      <PricingSelfHost />
-    </LandingSection>
-  );
-}
diff --git a/apps/www/src/features/www/pricing/sections/self-host.tsx b/apps/www/src/features/www/pricing/sections/self-host.tsx
deleted file mode 100644
index 28e338b66..000000000
--- a/apps/www/src/features/www/pricing/sections/self-host.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { ArrowUpRightIcon } from "lucide-react";
-
-/**
- * Renders the one-line self-hosting note under the plan columns.
- *
- * Sits inside the plans section rather than its own one, so the free-forever alternative reads
- * as a footnote to the tiers rather than an unrelated pitch further down the page.
- */
-export function PricingSelfHost() {
-  return (
-    <div className="flex flex-col gap-3 border-zinc-800 border-t px-6 py-6 md:flex-row md:items-center md:justify-between md:px-10">
-      <div className="font-sans text-[15px]/6 text-zinc-400 tracking-[-0.01em]">
-        Voidhash is open source — you can also run the whole platform yourself, for free.
-      </div>
-      <a
-        className="flex w-max items-center gap-1.5 font-sans text-[15px]/6 text-zinc-200 tracking-[-0.01em] transition-opacity hover:opacity-80"
-        href="https://github.com/voidhashcom/voidhash/tree/main/selfhost"
-        rel="noreferrer"
-        target="_blank"
-      >
-        Self-hosting guide
-        <ArrowUpRightIcon className="size-4 shrink-0" />
-      </a>
-    </div>
-  );
-}
diff --git a/apps/www/src/routeTree.gen.ts b/apps/www/src/routeTree.gen.ts
index 377daac8c..c8c6f0dc8 100644
--- a/apps/www/src/routeTree.gen.ts
+++ b/apps/www/src/routeTree.gen.ts
@@ -26,7 +26,6 @@ import { Route as AuthResetPasswordRouteImport } from './routes/auth/reset-passw
 import { Route as AuthLogoutRouteImport } from './routes/auth/logout'
 import { Route as AuthLoginRouteImport } from './routes/auth/login'
 import { Route as AuthForgotPasswordRouteImport } from './routes/auth/forgot-password'
-import { Route as MarketingPricingRouteImport } from './routes/_marketing/pricing'
 import { Route as StudioAuthenticatedRouteRouteImport } from './routes/studio/_authenticated/route'
 import { Route as StudioAuthenticatedIndexRouteImport } from './routes/studio/_authenticated/index'
 import { Route as AuthDevicesIndexRouteImport } from './routes/auth/devices/index'
@@ -168,11 +167,6 @@ const AuthForgotPasswordRoute = AuthForgotPasswordRouteImport.update({
   path: '/forgot-password',
   getParentRoute: () => AuthRouteRoute,
 } as any)
-const MarketingPricingRoute = MarketingPricingRouteImport.update({
-  id: '/pricing',
-  path: '/pricing',
-  getParentRoute: () => MarketingRouteRoute,
-} as any)
 const StudioAuthenticatedRouteRoute =
   StudioAuthenticatedRouteRouteImport.update({
     id: '/_authenticated',
@@ -614,7 +608,6 @@ export interface FileRoutesByFullPath {
   '/design': typeof DesignRouteRouteWithChildren
   '/docs': typeof DocsRouteRouteWithChildren
   '/studio': typeof StudioRouteRouteWithChildren
-  '/pricing': typeof MarketingPricingRoute
   '/auth/forgot-password': typeof AuthForgotPasswordRoute
   '/auth/login': typeof AuthLoginRoute
   '/auth/logout': typeof AuthLogoutRoute
@@ -683,7 +676,6 @@ export interface FileRoutesByFullPath {
 }
 export interface FileRoutesByTo {
   '/studio': typeof StudioAuthenticatedIndexRoute
-  '/pricing': typeof MarketingPricingRoute
   '/auth/forgot-password': typeof AuthForgotPasswordRoute
   '/auth/login': typeof AuthLoginRoute
   '/auth/logout': typeof AuthLogoutRoute
@@ -756,7 +748,6 @@ export interface FileRoutesById {
   '/docs': typeof DocsRouteRouteWithChildren
   '/studio': typeof StudioRouteRouteWithChildren
   '/studio/_authenticated': typeof StudioAuthenticatedRouteRouteWithChildren
-  '/_marketing/pricing': typeof MarketingPricingRoute
   '/auth/forgot-password': typeof AuthForgotPasswordRoute
   '/auth/login': typeof AuthLoginRoute
   '/auth/logout': typeof AuthLogoutRoute
@@ -833,7 +824,6 @@ export interface FileRouteTypes {
     | '/design'
     | '/docs'
     | '/studio'
-    | '/pricing'
     | '/auth/forgot-password'
     | '/auth/login'
     | '/auth/logout'
@@ -902,7 +892,6 @@ export interface FileRouteTypes {
   fileRoutesByTo: FileRoutesByTo
   to:
     | '/studio'
-    | '/pricing'
     | '/auth/forgot-password'
     | '/auth/login'
     | '/auth/logout'
@@ -974,7 +963,6 @@ export interface FileRouteTypes {
     | '/docs'
     | '/studio'
     | '/studio/_authenticated'
-    | '/_marketing/pricing'
     | '/auth/forgot-password'
     | '/auth/login'
     | '/auth/logout'
@@ -1182,13 +1170,6 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AuthForgotPasswordRouteImport
       parentRoute: typeof AuthRouteRoute
     }
-    '/_marketing/pricing': {
-      id: '/_marketing/pricing'
-      path: '/pricing'
-      fullPath: '/pricing'
-      preLoaderRoute: typeof MarketingPricingRouteImport
-      parentRoute: typeof MarketingRouteRoute
-    }
     '/studio/_authenticated': {
       id: '/studio/_authenticated'
       path: ''
@@ -1585,12 +1566,10 @@ declare module '@tanstack/react-router' {
 }
 
 interface MarketingRouteRouteChildren {
-  MarketingPricingRoute: typeof MarketingPricingRoute
   MarketingIndexRoute: typeof MarketingIndexRoute
 }
 
 const MarketingRouteRouteChildren: MarketingRouteRouteChildren = {
-  MarketingPricingRoute: MarketingPricingRoute,
   MarketingIndexRoute: MarketingIndexRoute,
 }
 
diff --git a/apps/www/src/routes/_marketing/pricing.tsx b/apps/www/src/routes/_marketing/pricing.tsx
deleted file mode 100644
index 86acb098b..000000000
--- a/apps/www/src/routes/_marketing/pricing.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { createFileRoute } from "@tanstack/react-router";
-
-import { PricingPage } from "@/features/www/pricing/pricing-page";
-
-export const Route = createFileRoute("/_marketing/pricing")({
-  component: MarketingPricing,
-});
-
-function MarketingPricing() {
-  return <PricingPage />;
-}
diff --git a/drizzle.config.ts b/drizzle.config.ts
index ed0036ccd..f194c0299 100644
--- a/drizzle.config.ts
+++ b/drizzle.config.ts
@@ -4,5 +4,20 @@ export default defineConfig({
   dialect: "postgresql",
   out: "./packages/db/src/alchemy-migrations",
   schema: "./packages/db/src/schema.ts",
-  tablesFilter: ["!cluster_*", "!mimic_*", "!effect_sql_migrations"],
+  tablesFilter: [
+    "!cluster_*",
+    "!mimic_*",
+    "!effect_sql_migrations",
+    // Cloud-billing tables are owned by the hosting deployment and may still
+    // exist (with live data) in databases this schema is applied to. They are
+    // absent from `schema.ts` but present in the newest tracked snapshot, so
+    // without these filters `db:generate` would propose DROP TABLE for them.
+    // See `packages/db/src/alchemy-migrations/20260728120000_remove_billing_tables/`.
+    // Do not remove.
+    "!organization_billing",
+    "!usage_record",
+    "!usage_aggregate",
+    "!billing_webhook_event",
+    "!billing_provider_meter",
+  ],
 });
diff --git a/packages/api-contracts/src/errors/Billing.ts b/packages/api-contracts/src/errors/Billing.ts
deleted file mode 100644
index dbf947e27..000000000
--- a/packages/api-contracts/src/errors/Billing.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Schema } from "effect";
-
-/** Generic billing service error */
-export class ApiBillingServiceError extends Schema.TaggedErrorClass<ApiBillingServiceError>()(
-  "Api/BillingServiceError",
-  {
-    cause: Schema.String,
-  },
-  { httpApiStatus: 500 },
-) {}
-
-/** Organization billing not found */
-export class ApiOrganizationBillingNotFoundError extends Schema.TaggedErrorClass<ApiOrganizationBillingNotFoundError>()(
-  "Api/OrganizationBillingNotFoundError",
-  {
-    message: Schema.String,
-  },
-  { httpApiStatus: 404 },
-) {}
-
-/** Invalid billing tier error */
-export class ApiInvalidBillingTierError extends Schema.TaggedErrorClass<ApiInvalidBillingTierError>()(
-  "Api/InvalidBillingTierError",
-  {
-    message: Schema.String,
-  },
-  { httpApiStatus: 400 },
-) {}
diff --git a/packages/api-contracts/src/errors/index.ts b/packages/api-contracts/src/errors/index.ts
index 8bc023782..6e0373ba9 100644
--- a/packages/api-contracts/src/errors/index.ts
+++ b/packages/api-contracts/src/errors/index.ts
@@ -1,6 +1,5 @@
 export * from "./Analytics.ts";
 export * from "./ApiKey.ts";
-export * from "./Billing.ts";
 export * from "./Common.ts";
 export * from "./Person.ts";
 export * from "./Organization.ts";
diff --git a/packages/core/package.json b/packages/core/package.json
index 6aa1ceed5..e4e6ff07a 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -113,7 +113,7 @@
     "./services/schema/SchemaService": "./src/services/schema/SchemaService.ts",
     "./services/schema/SchemaInvalidator": "./src/services/schema/SchemaInvalidator.ts",
     "./services/organizations/OrganizationService": "./src/services/organizations/OrganizationService.ts",
-    "./services/organizations/OrganizationBillingPort": "./src/services/organizations/OrganizationBillingPort.ts",
+    "./services/organizations/OrganizationLifecyclePort": "./src/services/organizations/OrganizationLifecyclePort.ts",
     "./services/organizations/OrganizationMembershipSyncPort": "./src/services/organizations/OrganizationMembershipSyncPort.ts",
     "./services/organizations/OrganizationMembershipWebhookPort": "./src/services/organizations/OrganizationMembershipWebhookPort.ts",
     "./services/organizations/WorkosOrgPort": "./src/services/organizations/WorkosOrgPort.ts",
diff --git a/packages/core/src/services/index.ts b/packages/core/src/services/index.ts
index a05063d3b..8f6b21ab2 100644
--- a/packages/core/src/services/index.ts
+++ b/packages/core/src/services/index.ts
@@ -24,7 +24,7 @@ export * from "./fxRates/FxRateService.ts";
 export * from "./slack/slack-client.ts";
 export * from "./internalFeatureFlags/InternalFeatureFlagService.ts";
 export * from "./organizations/OrganizationService.ts";
-export * from "./organizations/OrganizationBillingPort.ts";
+export * from "./organizations/OrganizationLifecyclePort.ts";
 export * from "./organizations/OrganizationMembershipSyncPort.ts";
 export * from "./organizations/OrganizationMembershipWebhookPort.ts";
 export * from "./organizations/WorkosOrgPort.ts";
diff --git a/packages/core/src/services/organizations/OrganizationBillingPort.ts b/packages/core/src/services/organizations/OrganizationBillingPort.ts
deleted file mode 100644
index 1c05d5d44..000000000
--- a/packages/core/src/services/organizations/OrganizationBillingPort.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Context, Effect, Layer, Schema } from "effect";
-
-/** Stable error exposed by organization billing extensions to the core organization service. */
-export class OrganizationBillingPortError extends Schema.TaggedErrorClass<OrganizationBillingPortError>(
-  "OrganizationBillingPortError",
-)("OrganizationBillingPortError", {
-  cause: Schema.String,
-  message: Schema.String,
-}) {}
-
-export interface OrganizationBillingPortShape {
-  /** Provisions the optional billing extension for a newly created organization. */
-  readonly initializeOrganizationBilling: (input: {
-    readonly organizationId: string;
-    readonly email?: string;
-  }) => Effect.Effect<void, OrganizationBillingPortError>;
-}
-
-/** Optional extension point invoked after core creates an organization. */
-export class OrganizationBillingPort extends Context.Service<
-  OrganizationBillingPort,
-  OrganizationBillingPortShape
->()("@voidhash/core/OrganizationBillingPort") {
-  /** Community layer for deployments without platform billing. */
-  static readonly noop: Layer.Layer<OrganizationBillingPort> = Layer.succeed(
-    OrganizationBillingPort,
-    {
-      initializeOrganizationBilling: () => Effect.void,
-    },
-  );
-}
diff --git a/packages/core/src/services/organizations/OrganizationLifecyclePort.ts b/packages/core/src/services/organizations/OrganizationLifecyclePort.ts
new file mode 100644
index 000000000..106854da1
--- /dev/null
+++ b/packages/core/src/services/organizations/OrganizationLifecyclePort.ts
@@ -0,0 +1,31 @@
+import { Context, Effect, Layer, Schema } from "effect";
+
+/** Stable error exposed by organization lifecycle extensions to the core organization service. */
+export class OrganizationLifecyclePortError extends Schema.TaggedErrorClass<OrganizationLifecyclePortError>(
+  "OrganizationLifecyclePortError",
+)("OrganizationLifecyclePortError", {
+  cause: Schema.String,
+  message: Schema.String,
+}) {}
+
+export interface OrganizationLifecyclePortShape {
+  /** Invoked after core creates an organization so host deployments can provision extensions. */
+  readonly organizationCreated: (input: {
+    readonly organizationId: string;
+    readonly email?: string;
+  }) => Effect.Effect<void, OrganizationLifecyclePortError>;
+}
+
+/** Optional extension point invoked around organization lifecycle transitions. */
+export class OrganizationLifecyclePort extends Context.Service<
+  OrganizationLifecyclePort,
+  OrganizationLifecyclePortShape
+>()("@voidhash/core/OrganizationLifecyclePort") {
+  /** Community layer for deployments without lifecycle extensions. */
+  static readonly noop: Layer.Layer<OrganizationLifecyclePort> = Layer.succeed(
+    OrganizationLifecyclePort,
+    {
+      organizationCreated: () => Effect.void,
+    },
+  );
+}
diff --git a/packages/core/src/services/organizations/OrganizationService.ts b/packages/core/src/services/organizations/OrganizationService.ts
index d5a31c4de..46d88eb7f 100644
--- a/packages/core/src/services/organizations/OrganizationService.ts
+++ b/packages/core/src/services/organizations/OrganizationService.ts
@@ -16,7 +16,7 @@ import { createSlug } from "../../utils/create-slug.ts";
 import { generateId } from "../../utils/generate-id.ts";
 import { checkOrganizationPermission } from "../../utils/permissions.ts";
 import { PublicFileStore } from "../storage/PublicFileStore.ts";
-import { OrganizationBillingPort } from "./OrganizationBillingPort.ts";
+import { OrganizationLifecyclePort } from "./OrganizationLifecyclePort.ts";
 import { WorkosOrgPort } from "./WorkosOrgPort.ts";
 
 /**
@@ -39,17 +39,17 @@ export class OrganizationServiceError extends Schema.TaggedErrorClass<Organizati
  * policies keyed on the per-query `SQL_organization_id` setting, so adding a
  * tenant is zero ClickHouse DDL.
  *
- * `Db`, `WorkosOrgPort`, `OrganizationBillingPort`, and `AuthSession` are
+ * `Db`, `WorkosOrgPort`, `OrganizationLifecyclePort`, and `AuthSession` are
  * provided by the application root. Community deployments use the no-op
- * billing port; cloud and Enterprise deployments provide their billing
- * extension without coupling this service to its implementation.
+ * lifecycle port; hosted deployments provide their own lifecycle extension
+ * without coupling this service to its implementation.
  */
 export class OrganizationService extends Context.Service<OrganizationService>()(
   "OrganizationService",
   {
     make: Effect.gen(function* () {
       const workosOrgPort = yield* WorkosOrgPort;
-      const organizationBilling = yield* OrganizationBillingPort;
+      const organizationLifecycle = yield* OrganizationLifecyclePort;
       const publicFileStore = yield* PublicFileStore;
       const db = yield* Db;
 
@@ -278,15 +278,17 @@ export class OrganizationService extends Context.Service<OrganizationService>()(
               ),
             );
 
-          // Provision billing — non-fatal: log and continue if it fails.
-          yield* organizationBilling
-            .initializeOrganizationBilling({
+          // Run the organization-created hook — non-fatal: log and continue if it fails.
+          yield* organizationLifecycle
+            .organizationCreated({
               email: sessionUser.email,
               organizationId: orgId,
             })
             .pipe(
               Effect.catch((error) =>
-                Effect.logWarning(`Failed to initialize billing for org ${orgId}: ${error}`),
+                Effect.logWarning(
+                  `Failed to run the organization-created hook for org ${orgId}: ${error}`,
+                ),
               ),
             );
 
diff --git a/packages/core/src/services/slack/slack-client.ts b/packages/core/src/services/slack/slack-client.ts
index 0b3007a14..ca7685e05 100644
--- a/packages/core/src/services/slack/slack-client.ts
+++ b/packages/core/src/services/slack/slack-client.ts
@@ -4,9 +4,9 @@
  * but generic enough for any internal notification.
  *
  * Uses the runtime's built-in `fetch` so it runs natively on Cloudflare Workers
- * without an Effect `HttpClient` dependency — same approach as
- * {@link createAutumnClient}. The bot token (`xoxb-…`) and default channel are
- * read from {@link SlackConfig} at layer build (worker boot), keeping the
+ * without an Effect `HttpClient` dependency. The bot token (`xoxb-…`) and
+ * default channel are read from {@link SlackConfig} at layer build (worker
+ * boot), keeping the
  * resolver (Alchemy secrets / `Config`) decoupled from the constructor.
  *
  * When the bot token or the target channel is missing the client **fails
@@ -53,7 +53,7 @@ export class SlackClientTag extends Context.Service<SlackClientTag, SlackClient>
 /**
  * Runtime configuration for the live Slack client. Fields are Effect-of-string
  * so the resolver (Alchemy secrets / `Config`) is decoupled from the
- * constructor — matches the {@link AutumnConfig} pattern.
+ * constructor.
  */
 export interface SlackConfig {
   readonly botToken: Effect.Effect<string>;
diff --git a/packages/core/src/utils/generate-id.ts b/packages/core/src/utils/generate-id.ts
index a2854a29c..cad25517d 100644
--- a/packages/core/src/utils/generate-id.ts
+++ b/packages/core/src/utils/generate-id.ts
@@ -46,12 +46,6 @@ const prefixes = {
   appStoreTransaction: "app_store_tx",
   analyticsIngestDlq: "an_ing_dlq",
   analyticsEvent: "an_evt",
-  // Billing
-  organizationBilling: "org_bill",
-  usageRecord: "usage",
-  usageAggregate: "usage_agg",
-  billingWebhookEvent: "bill_wh",
-  billingProviderMeter: "bill_meter",
   // Webhooks
   webhookEndpoint: "wh_ep",
   webhookDelivery: "wh_del",
@@ -93,5 +87,14 @@ const prefixes = {
   pushNotificationDeliveryAttempt: "push_att",
 } as const;
 
-export const generateId = <TPrefix extends keyof typeof prefixes>(prefix: TPrefix) =>
-  `${prefixes[prefix]}_${createId()}`;
+/**
+ * Builds a prefixed cuid2 id generator over a caller-owned prefix table, so
+ * host packages can mint ids in the same `<prefix>_<cuid2>` shape without
+ * registering their prefixes in core.
+ */
+export const createIdGenerator =
+  <const TPrefixes extends Record<string, string>>(table: TPrefixes) =>
+  <TPrefix extends keyof TPrefixes>(prefix: TPrefix) =>
+    `${table[prefix]}_${createId()}`;
+
+export const generateId = createIdGenerator(prefixes);
diff --git a/packages/core/test/services/organizations/OrganizationBillingPort.test.ts b/packages/core/test/services/organizations/OrganizationBillingPort.test.ts
deleted file mode 100644
index 8c3c2d030..000000000
--- a/packages/core/test/services/organizations/OrganizationBillingPort.test.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Effect } from "effect";
-import { describe, it } from "vitest";
-
-import { OrganizationBillingPort } from "@voidhash/core/services/organizations/OrganizationBillingPort";
-
-describe("OrganizationBillingPort", () => {
-  it("does nothing when the Community layer is installed", async () => {
-    await Effect.gen(function* () {
-      const port = yield* OrganizationBillingPort;
-      yield* port.initializeOrganizationBilling({ organizationId: "org_community" });
-    }).pipe(Effect.provide(OrganizationBillingPort.noop), Effect.runPromise);
-  });
-});
diff --git a/packages/core/test/services/organizations/OrganizationLifecyclePort.test.ts b/packages/core/test/services/organizations/OrganizationLifecyclePort.test.ts
new file mode 100644
index 000000000..ec304098a
--- /dev/null
+++ b/packages/core/test/services/organizations/OrganizationLifecyclePort.test.ts
@@ -0,0 +1,13 @@
+import { Effect } from "effect";
+import { describe, it } from "vitest";
+
+import { OrganizationLifecyclePort } from "@voidhash/core/services/organizations/OrganizationLifecyclePort";
+
+describe("OrganizationLifecyclePort", () => {
+  it("does nothing when the Community layer is installed", async () => {
+    await Effect.gen(function* () {
+      const port = yield* OrganizationLifecyclePort;
+      yield* port.organizationCreated({ organizationId: "org_community" });
+    }).pipe(Effect.provide(OrganizationLifecyclePort.noop), Effect.runPromise);
+  });
+});
diff --git a/packages/core/test/services/organizations/OrganizationService.integration.test.ts b/packages/core/test/services/organizations/OrganizationService.integration.test.ts
index 29af8e738..1cb3f9f8e 100644
--- a/packages/core/test/services/organizations/OrganizationService.integration.test.ts
+++ b/packages/core/test/services/organizations/OrganizationService.integration.test.ts
@@ -14,9 +14,9 @@
  * *real* database, and each test asserts the persisted side effect rather than
  * just the return value.
  *
- * `OrganizationBillingPort` is the optional extension seam; a recording stub
- * stands in so the non-fatal provisioning step can be driven to succeed or
- * fail.
+ * `OrganizationLifecyclePort` is the optional extension seam; a recording stub
+ * stands in so the non-fatal organization-created hook can be driven to succeed
+ * or fail.
  *
  * Conventions used throughout:
  *  - Names/slugs/ids are unique per call so a leftover row from a crashed run
@@ -40,8 +40,8 @@ import { Effect, Layer } from "effect";
 import { describe, expect } from "vitest";
 
 import {
-  OrganizationBillingPort,
-  OrganizationBillingPortError,
+  OrganizationLifecyclePort,
+  OrganizationLifecyclePortError,
   OrganizationService,
   OrganizationServiceError,
   WorkosOrgPort,
@@ -308,25 +308,28 @@ const makeFakePort = (config: FakePortConfig = {}): FakePort => {
   return { calls, layer };
 };
 
-// --- fake OrganizationBillingPort ------------------------------------------
+// --- fake OrganizationLifecyclePort ----------------------------------------
 
-interface BillingCalls {
-  initializeOrganizationBilling: Array<{ organizationId: string; email?: string }>;
+interface LifecycleCalls {
+  organizationCreated: Array<{ organizationId: string; email?: string }>;
 }
 
-interface FakeBilling {
-  readonly calls: BillingCalls;
-  readonly layer: Layer.Layer<OrganizationBillingPort>;
+interface FakeLifecycle {
+  readonly calls: LifecycleCalls;
+  readonly layer: Layer.Layer<OrganizationLifecyclePort>;
 }
 
-const makeFakeBilling = (options: { fail?: boolean } = {}): FakeBilling => {
-  const calls: BillingCalls = { initializeOrganizationBilling: [] };
-  const layer = Layer.succeed(OrganizationBillingPort, {
-    initializeOrganizationBilling: (input) => {
-      calls.initializeOrganizationBilling.push(input);
+const makeFakeLifecycle = (options: { fail?: boolean } = {}): FakeLifecycle => {
+  const calls: LifecycleCalls = { organizationCreated: [] };
+  const layer = Layer.succeed(OrganizationLifecyclePort, {
+    organizationCreated: (input) => {
+      calls.organizationCreated.push(input);
       if (options.fail) {
         return Effect.fail(
-          new OrganizationBillingPortError({ cause: "fake", message: "billing init failed" }),
+          new OrganizationLifecyclePortError({
+            cause: "fake",
+            message: "organization-created hook failed",
+          }),
         );
       }
       return Effect.void;
@@ -339,17 +342,17 @@ const makeFakeBilling = (options: { fail?: boolean } = {}): FakeBilling => {
 
 /**
  * Provide `OrganizationService` plus its non-harness collaborators: the fake
- * WorkOS port and a recording billing stub. Provided at the top-level test pipe so the body's
+ * WorkOS port and a recording lifecycle stub. Provided at the top-level test pipe so the body's
  * `OrganizationService` requirement is fully discharged before the harness sees
  * it (leaving only harness services in `R`).
  */
-const orgServiceLayer = (port: FakePort, billing: FakeBilling) =>
+const orgServiceLayer = (port: FakePort, lifecycle: FakeLifecycle) =>
   Layer.mergeAll(
     OrganizationService.layer.pipe(
-      Layer.provide(Layer.mergeAll(port.layer, billing.layer)),
+      Layer.provide(Layer.mergeAll(port.layer, lifecycle.layer)),
     ),
     port.layer,
-    billing.layer,
+    lifecycle.layer,
   );
 
 // --- session builders -------------------------------------------------------
@@ -419,7 +422,7 @@ describe("OrganizationService.getOrganizationById", () => {
       expect(org.id).toBe(CoreTestFixture.organizationId);
       expect(org.slug).toBe(CoreTestFixture.organizationSlug);
     }).pipe(
-      Effect.provide(orgServiceLayer(makeFakePort(), makeFakeBilling())),
+      Effect.provide(orgServiceLayer(makeFakePort(), makeFakeLifecycle())),
       CoreAuthSession.authenticate(),
     ),
   );
@@ -431,7 +434,7 @@ describe("OrganizationService.getOrganizationById", () => {
       const error = yield* Effect.flip(svc.getOrganizationById(`org_missing_${Date.now()}`));
       expect(error).toBeInstanceOf(OrganizationNotFoundError);
     }).pipe(
-      Effect.provide(orgServiceLayer(makeFakePort(), makeFakeBilling())),
+      Effect.provide(orgServiceLayer(makeFakePort(), makeFakeLifecycle())),
       CoreAuthSession.authenticate(),
     ),
   );
@@ -445,7 +448,7 @@ describe("OrganizationService.getOrganizationById", () => {
       );
       expect(error).toBeInstanceOf(ActionForbiddenError);
     }).pipe(
-      Effect.provide(orgServiceLayer(makeFakePort(), makeFakeBilling())),
+      Effect.provide(orgServiceLayer(makeFakePort(), makeFakeLifecycle())),
       CoreAuthSession.authenticate(),
     ),
   );
@@ -461,7 +464,7 @@ describe("OrganizationService.getOrganizationBySlug", () => {
         .pipe(as(userSessionWithOrgs([CoreTestFixture.organizationId])));
       expect(org.id).toBe(CoreTestFixture.organizationId);
     }).pipe(
-      Effect.provide(orgServiceLayer(makeFakePort(), makeFakeBilling())),
+      Effect.provide(orgServiceLayer(makeFakePort(), makeFakeLifecycle())),
       CoreAuthSession.authenticate(),
     ),
   );
@@ -473,7 +476,7 @@ describe("OrganizationService.getOrganizationBySlug", () => {
       const error = yield* Effect.flip(svc.getOrganizationBySlug(`it-missing-${Date.now()}`));
       expect(error).toBeInstanceOf(OrganizationNotFoundError);
     }).pipe(
-      Effect.provide(orgServiceLayer(makeFakePort(), makeFakeBilling())),
+      Effect.provide(orgServiceLayer(makeFakePort(), makeFakeLifecycle())),
       CoreAuthSession.authenticate(),
     ),
   );
@@ -489,7 +492,7 @@ describe("OrganizationService.getOrganizationBySlug", () => {
       );
       expect(error).toBeInstanceOf(ActionForbiddenError);
     }).pipe(
-      Effect.provide(orgServiceLayer(makeFakePort(), makeFakeBilling())),
+      Effect.provide(orgServiceLayer(makeFakePort(), makeFakeLifecycle())),
       CoreAuthSession.authenticate(),
     ),
   );
@@ -497,10 +500,10 @@ describe("OrganizationService.getOrganizationBySlug", () => {
 
 describe("OrganizationService.createOrganization", () => {
   test(
-    "creates the WorkOS org, local org + owner member, provisions billing, returns {id,name,slug}",
+    "creates the WorkOS org, local org + owner member, runs the created hook, returns {id,name,slug}",
     (() => {
       const port = makeFakePort();
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       return withCleanup((track) =>
         Effect.gen(function* () {
           const svc = yield* OrganizationService;
@@ -527,14 +530,14 @@ describe("OrganizationService.createOrganization", () => {
           expect(owner).toBeDefined();
           expect(owner?.role).toBe("owner");
 
-          // Billing was invoked for the new org (non-fatal step, but it ran).
+          // The lifecycle hook was invoked for the new org (non-fatal step, but it ran).
           expect(
-            billing.calls.initializeOrganizationBilling.some(
+            lifecycle.calls.organizationCreated.some(
               (c) => c.organizationId === created.id,
             ),
           ).toBe(true);
         }),
-      ).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      ).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 
@@ -542,7 +545,7 @@ describe("OrganizationService.createOrganization", () => {
     "appends a short id when the base slug is in SLUG_BLACKLIST",
     (() => {
       const port = makeFakePort();
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       return withCleanup((track) =>
         Effect.gen(function* () {
           const svc = yield* OrganizationService;
@@ -556,7 +559,7 @@ describe("OrganizationService.createOrganization", () => {
           const orgRow = yield* findOrgRow(created.id);
           expect(orgRow?.slug).toBe(created.slug);
         }),
-      ).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      ).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 
@@ -564,7 +567,7 @@ describe("OrganizationService.createOrganization", () => {
     "appends a short id when the base slug already exists in the DB",
     (() => {
       const port = makeFakePort();
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       return withCleanup((track) =>
         Effect.gen(function* () {
           const svc = yield* OrganizationService;
@@ -584,7 +587,7 @@ describe("OrganizationService.createOrganization", () => {
           expect(firstRow?.slug).toBe(first.slug);
           expect(secondRow?.slug).toBe(second.slug);
         }),
-      ).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      ).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 
@@ -594,7 +597,7 @@ describe("OrganizationService.createOrganization", () => {
       const port = makeFakePort({
         onCreateOrganization: () => Effect.fail(portError("workos org create boom")),
       });
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       const name = uniqueName("wos-fail");
       return Effect.gen(function* () {
         const svc = yield* OrganizationService;
@@ -605,7 +608,7 @@ describe("OrganizationService.createOrganization", () => {
         expect(port.calls.createMembership.length).toBe(0);
         const orgRow = yield* findOrgRowBySlug(slugFor(name));
         expect(orgRow).toBeUndefined();
-      }).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      }).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 
@@ -615,7 +618,7 @@ describe("OrganizationService.createOrganization", () => {
       const port = makeFakePort({
         onCreateMembership: () => Effect.fail(portError("workos membership boom")),
       });
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       const name = uniqueName("wm-fail");
       return Effect.gen(function* () {
         const svc = yield* OrganizationService;
@@ -626,7 +629,7 @@ describe("OrganizationService.createOrganization", () => {
         expect(port.calls.deleteOrganization.length).toBe(1);
         const orgRow = yield* findOrgRowBySlug(slugFor(name));
         expect(orgRow).toBeUndefined();
-      }).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      }).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 
@@ -644,7 +647,7 @@ describe("OrganizationService.createOrganization", () => {
             name: input.name,
           }),
       });
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       const name = uniqueName("db-fail");
       return Effect.gen(function* () {
         const svc = yield* OrganizationService;
@@ -655,33 +658,33 @@ describe("OrganizationService.createOrganization", () => {
         expect(port.calls.deleteOrganization.length).toBe(1);
         const orgRow = yield* findOrgRowBySlug(slugFor(name));
         expect(orgRow).toBeUndefined();
-      }).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      }).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 
   test(
-    "still creates the org when billing init fails (non-fatal)",
+    "still creates the org when the organization-created hook fails (non-fatal)",
     (() => {
       const port = makeFakePort();
-      const billing = makeFakeBilling({ fail: true });
+      const lifecycle = makeFakeLifecycle({ fail: true });
       return withCleanup((track) =>
         Effect.gen(function* () {
           const svc = yield* OrganizationService;
-          const name = uniqueName("billing-fail");
+          const name = uniqueName("lifecycle-fail");
 
           const created = yield* svc.createOrganization({ name });
           track.orgs.push(created.id);
 
           expect(created.name).toBe(name);
-          expect(billing.calls.initializeOrganizationBilling.length).toBe(1);
+          expect(lifecycle.calls.organizationCreated.length).toBe(1);
 
-          // The org + owner member persisted despite the billing failure.
+          // The org + owner member persisted despite the hook failure.
           const orgRow = yield* findOrgRow(created.id);
           expect(orgRow).toBeDefined();
           const members = yield* findMembersInOrg(created.id);
           expect(members.length).toBe(1);
         }),
-      ).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      ).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 
@@ -689,7 +692,7 @@ describe("OrganizationService.createOrganization", () => {
     "fails with OrganizationServiceError for an api-key (no user) session, writing nothing",
     (() => {
       const port = makeFakePort();
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       const name = uniqueName("no-user");
       return Effect.gen(function* () {
         const svc = yield* OrganizationService;
@@ -702,7 +705,7 @@ describe("OrganizationService.createOrganization", () => {
         expect(port.calls.createOrganization.length).toBe(0);
         const orgRow = yield* findOrgRowBySlug(slugFor(name));
         expect(orgRow).toBeUndefined();
-      }).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      }).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 
@@ -710,7 +713,7 @@ describe("OrganizationService.createOrganization", () => {
     "fails with OrganizationServiceError when the session user has no WorkOS id and none is found by email",
     (() => {
       const port = makeFakePort({ findUserByEmail: null });
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       const name = uniqueName("no-workos-id");
       return Effect.gen(function* () {
         const svc = yield* OrganizationService;
@@ -726,7 +729,7 @@ describe("OrganizationService.createOrganization", () => {
         expect(port.calls.createOrganization.length).toBe(0);
         const orgRow = yield* findOrgRowBySlug(slugFor(name));
         expect(orgRow).toBeUndefined();
-      }).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      }).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 });
@@ -736,7 +739,7 @@ describe("OrganizationService.updateOrganization", () => {
     "renames the org in WorkOS and the local DB",
     (() => {
       const port = makeFakePort();
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       const orgId = uniqueId("upd-org");
       const wo = uniqueId("upd-wo");
       return withCleanup((track) =>
@@ -761,7 +764,7 @@ describe("OrganizationService.updateOrganization", () => {
           const orgRow = yield* findOrgRow(orgId);
           expect(orgRow?.name).toBe(newName);
         }),
-      ).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      ).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 
@@ -769,7 +772,7 @@ describe("OrganizationService.updateOrganization", () => {
     "forbids a caller without organization:all and writes nothing",
     (() => {
       const port = makeFakePort();
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       return Effect.gen(function* () {
         const svc = yield* OrganizationService;
         const before = yield* findOrgRow(CoreTestFixture.organizationId);
@@ -786,7 +789,7 @@ describe("OrganizationService.updateOrganization", () => {
         expect(port.calls.updateOrganization.length).toBe(0);
         const after = yield* findOrgRow(CoreTestFixture.organizationId);
         expect(after?.name).toBe(before?.name);
-      }).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      }).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 
@@ -794,7 +797,7 @@ describe("OrganizationService.updateOrganization", () => {
     "fails with OrganizationNotFoundError for an unknown org",
     (() => {
       const port = makeFakePort();
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       const orgId = `org_missing_${Date.now()}`;
       return Effect.gen(function* () {
         const svc = yield* OrganizationService;
@@ -805,7 +808,7 @@ describe("OrganizationService.updateOrganization", () => {
         );
         expect(error).toBeInstanceOf(OrganizationNotFoundError);
         expect(port.calls.updateOrganization.length).toBe(0);
-      }).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      }).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 
@@ -815,7 +818,7 @@ describe("OrganizationService.updateOrganization", () => {
       const port = makeFakePort({
         onUpdateOrganization: () => Effect.fail(portError("workos update boom")),
       });
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       const orgId = uniqueId("upd-fail-org");
       return withCleanup((track) =>
         Effect.gen(function* () {
@@ -838,7 +841,7 @@ describe("OrganizationService.updateOrganization", () => {
           const orgRow = yield* findOrgRow(orgId);
           expect(orgRow?.name).toBe("Keep");
         }),
-      ).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      ).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 });
@@ -848,7 +851,7 @@ describe("OrganizationService.deleteOrganization", () => {
     "deletes the org in WorkOS and locally, cascading members",
     (() => {
       const port = makeFakePort();
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       const orgId = uniqueId("del-org");
       const wo = uniqueId("del-wo");
       return withCleanup((track) =>
@@ -878,7 +881,7 @@ describe("OrganizationService.deleteOrganization", () => {
           const members = yield* findMembersInOrg(orgId);
           expect(members.length).toBe(0);
         }),
-      ).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      ).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 
@@ -886,7 +889,7 @@ describe("OrganizationService.deleteOrganization", () => {
     "forbids a caller without organization:all and retains the org",
     (() => {
       const port = makeFakePort();
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       return Effect.gen(function* () {
         const svc = yield* OrganizationService;
         const error = yield* Effect.flip(
@@ -899,7 +902,7 @@ describe("OrganizationService.deleteOrganization", () => {
         expect(port.calls.deleteOrganization.length).toBe(0);
         const orgRow = yield* findOrgRow(CoreTestFixture.organizationId);
         expect(orgRow).toBeDefined();
-      }).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      }).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 
@@ -907,7 +910,7 @@ describe("OrganizationService.deleteOrganization", () => {
     "succeeds silently and skips WorkOS when the org row is absent (idempotent)",
     (() => {
       const port = makeFakePort();
-      const billing = makeFakeBilling();
+      const lifecycle = makeFakeLifecycle();
       const orgId = `org_missing_${Date.now()}`;
       return Effect.gen(function* () {
         const svc = yield* OrganizationService;
@@ -917,7 +920,7 @@ describe("OrganizationService.deleteOrganization", () => {
 
         // No WorkOS delete fired because there was no local org to mirror.
         expect(port.calls.deleteOrganization.length).toBe(0);
-      }).pipe(Effect.provide(orgServiceLayer(port, billing)), CoreAuthSession.authenticate());
+      }).pipe(Effect.provide(orgServiceLayer(port, lifecycle)), CoreAuthSession.authenticate());
     })(),
   );
 });
diff --git a/packages/core/test/utils/generate-id.test.ts b/packages/core/test/utils/generate-id.test.ts
index 55b148178..1dd98d014 100644
--- a/packages/core/test/utils/generate-id.test.ts
+++ b/packages/core/test/utils/generate-id.test.ts
@@ -12,7 +12,7 @@ import { generateId } from "../../src/utils/generate-id.ts";
 
 // (prefix-key, expected string prefix) pairs lifted from the `prefixes` const in
 // the source. We deliberately spot-check a representative spread of entity types
-// (auth, billing, payment providers, webhooks, feature flags, …) including a few
+// (auth, payment providers, webhooks, feature flags, …) including a few
 // where the literal prefix is a non-obvious abbreviation (org, pw_loc_show, …).
 const PREFIX_CASES = [
   ["user", "user"],
diff --git a/packages/db/src/alchemy-migrations/20260728120000_remove_billing_tables/migration.sql b/packages/db/src/alchemy-migrations/20260728120000_remove_billing_tables/migration.sql
new file mode 100644
index 000000000..9f0413e31
--- /dev/null
+++ b/packages/db/src/alchemy-migrations/20260728120000_remove_billing_tables/migration.sql
@@ -0,0 +1,10 @@
+-- Cloud billing left this repository: `organization_billing`, `usage_record`,
+-- `usage_aggregate`, `billing_webhook_event` and `billing_provider_meter` are
+-- no longer declared in `packages/db/src/schema.ts`.
+--
+-- Deliberately NOT a set of DROP TABLE statements. Those tables are owned by
+-- the hosting deployment now — it keeps its own schema for them and their data
+-- must survive this release. Self-hosted deployments simply never create them.
+-- `drizzle.config.ts` excludes them via `tablesFilter` so future generates do
+-- not re-propose the drops.
+SELECT 1;
diff --git a/packages/db/src/relations.ts b/packages/db/src/relations.ts
index 63adf805b..0620774e5 100644
--- a/packages/db/src/relations.ts
+++ b/packages/db/src/relations.ts
@@ -149,12 +149,6 @@ export const relations = defineRelations(schema, (r) => ({
       to: r.paywallDeploys.id,
     }),
   },
-  organizationBilling: {
-    organization: r.one.organization({
-      from: r.organizationBilling.organizationId,
-      to: r.organization.id,
-    }),
-  },
   webhookEndpoints: {
     project: r.one.projects({ from: r.webhookEndpoints.projectId, to: r.projects.id }),
     deliveries: r.many.webhookDeliveries(),
diff --git a/packages/db/src/schema.ts b/packages/db/src/schema.ts
index 002c94df7..8c59a5106 100644
--- a/packages/db/src/schema.ts
+++ b/packages/db/src/schema.ts
@@ -1700,189 +1700,9 @@ export const paywallComponentVersions = pgTable(
 );
 
 // ============================================
-// BILLING TABLES
+// WORKOS WEBHOOK TABLES
 // ============================================
 
-export const BillingTier = {
-  Enterprise: 3,
-  Free: 1,
-  Pro: 2,
-} as const;
-
-export type BillingTierValue = (typeof BillingTier)[keyof typeof BillingTier];
-
-export const BillingSubscriptionStatus = {
-  Active: 1,
-  Canceled: 2,
-  None: 0,
-  PastDue: 3,
-  Trialing: 4,
-} as const;
-
-export type BillingSubscriptionStatusValue =
-  (typeof BillingSubscriptionStatus)[keyof typeof BillingSubscriptionStatus];
-
-/**
- * Links organizations to their billing configuration and provider customer
- */
-export const organizationBilling = pgTable(
-  "organization_billing",
-  {
-    id: varchar("id", { length: 255 }).primaryKey(),
-    organizationId: varchar("organization_id", { length: 255 }).notNull(),
-
-    /** Current billing tier */
-    tier: smallint("tier").notNull().default(BillingTier.Free),
-
-    /** Billing provider (e.g., 'polar', 'stripe') */
-    billingProviderId: varchar("billing_provider_id", { length: 50 }).notNull().default("polar"),
-
-    /** External customer ID in the billing provider (e.g., Polar customer ID) */
-    externalCustomerId: varchar("external_customer_id", { length: 255 }),
-
-    /** Subscription status synced from provider */
-    subscriptionStatus: smallint("subscription_status")
-      .notNull()
-      .default(BillingSubscriptionStatus.None),
-
-    /** External subscription ID in the billing provider */
-    externalSubscriptionId: varchar("external_subscription_id", {
-      length: 255,
-    }),
-
-    /** Current billing period start */
-    currentPeriodStart: timestamp("current_period_start", { withTimezone: true, precision: 3 }),
-
-    /** Current billing period end */
-    currentPeriodEnd: timestamp("current_period_end", { withTimezone: true, precision: 3 }),
-
-    createdAt: timestamp("created_at", { withTimezone: true, precision: 3 }).defaultNow(),
-    updatedAt: timestamp("updated_at", { withTimezone: true, precision: 3 }).$onUpdate(
-      () => new Date(),
-    ),
-  },
-  (table) => [
-    uniqueIndex("organization_id_unique_idx").on(table.organizationId),
-    index("external_customer_id_idx").on(table.externalCustomerId),
-    index("billing_provider_id_idx").on(table.billingProviderId),
-  ],
-);
-
-/**
- * Local usage records - stored locally first, then synced to provider asynchronously
- */
-export const usageRecords = pgTable(
-  "usage_record",
-  {
-    id: varchar("id", { length: 255 }).primaryKey(),
-    organizationId: varchar("organization_id", { length: 255 }).notNull(),
-
-    /** Metric identifier (e.g., 'paywall_conversions', 'monthly_tracked_revenue') */
-    metricId: varchar("metric_id", { length: 100 }).notNull(),
-
-    /** Usage value */
-    value: bigint("value", { mode: "number" }).notNull(),
-
-    /** Billing period this usage belongs to */
-    periodStart: timestamp("period_start", { withTimezone: true, precision: 3 }).notNull(),
-    periodEnd: timestamp("period_end", { withTimezone: true, precision: 3 }).notNull(),
-
-    /** Whether this record has been synced to the billing provider */
-    syncedToProvider: boolean("synced_to_provider").notNull().default(false),
-    syncedAt: timestamp("synced_at", { withTimezone: true, precision: 3 }),
-    syncError: varchar("sync_error", { length: 500 }),
-
-    /** Additional context for the usage event */
-    metadata: jsonb("metadata").$type<Record<string, unknown>>(),
-
-    /** When the usage event occurred */
-    occurredAt: timestamp("occurred_at", { withTimezone: true, precision: 3 }).notNull(),
-    createdAt: timestamp("created_at", { withTimezone: true, precision: 3 }).defaultNow(),
-  },
-  (table) => [
-    index("org_metric_period_idx").on(
-      table.organizationId,
-      table.metricId,
-      table.periodStart,
-      table.periodEnd,
-    ),
-    index("synced_to_provider_idx").on(table.syncedToProvider),
-  ],
-);
-
-/**
- * Pre-computed usage aggregates for performance
- */
-export const usageAggregates = pgTable(
-  "usage_aggregate",
-  {
-    id: varchar("id", { length: 255 }).primaryKey(),
-    organizationId: varchar("organization_id", { length: 255 }).notNull(),
-
-    /** Metric identifier */
-    metricId: varchar("metric_id", { length: 100 }).notNull(),
-
-    /** Billing period */
-    periodStart: timestamp("period_start", { withTimezone: true, precision: 3 }).notNull(),
-    periodEnd: timestamp("period_end", { withTimezone: true, precision: 3 }).notNull(),
-
-    /** Aggregated total value for the period */
-    totalValue: bigint("total_value", { mode: "number" }).notNull().default(0),
-
-    /** Limit for this metric (null = unlimited) */
-    limitValue: bigint("limit_value", { mode: "number" }),
-
-    /** Threshold at which to show warnings */
-    warnThreshold: bigint("warn_threshold", { mode: "number" }),
-
-    createdAt: timestamp("created_at", { withTimezone: true, precision: 3 }).defaultNow(),
-    updatedAt: timestamp("updated_at", { withTimezone: true, precision: 3 }).$onUpdate(
-      () => new Date(),
-    ),
-  },
-  (table) => [
-    uniqueIndex("org_metric_period_unique_idx").on(
-      table.organizationId,
-      table.metricId,
-      table.periodStart,
-    ),
-  ],
-);
-
-/**
- * Billing webhook events for idempotency tracking
- */
-export const billingWebhookEvents = pgTable(
-  "billing_webhook_event",
-  {
-    id: varchar("id", { length: 255 }).primaryKey(),
-
-    /** Billing provider ID (e.g., 'polar', 'stripe') */
-    providerId: varchar("provider_id", { length: 50 }).notNull(),
-
-    /** External event ID from the provider */
-    externalEventId: varchar("external_event_id", { length: 255 }).notNull(),
-
-    /** Event type (e.g., 'subscription.created') */
-    eventType: varchar("event_type", { length: 100 }).notNull(),
-
-    /** Full event payload */
-    payload: jsonb("payload").$type<object>(),
-
-    /** When the event was processed (null = not yet processed) */
-    processedAt: timestamp("processed_at", { withTimezone: true, precision: 3 }),
-
-    /** Error message if processing failed */
-    error: varchar("error", { length: 500 }),
-
-    createdAt: timestamp("created_at", { withTimezone: true, precision: 3 }).defaultNow(),
-  },
-  (table) => [
-    uniqueIndex("provider_event_unique_idx").on(table.providerId, table.externalEventId),
-    index("processed_at_idx").on(table.processedAt),
-  ],
-);
-
 /**
  * WorkOS webhook events — idempotency tracking for the `/api/webhooks/workos`
  * endpoint. Insert with `processedAt = null`, mutate on success, leave the
@@ -1917,35 +1737,6 @@ export const workosWebhookEvents = pgTable(
   ],
 );
 
-/**
- * Billing provider meters - tracks meter sync status with provider
- */
-export const billingProviderMeters = pgTable(
-  "billing_provider_meter",
-  {
-    id: varchar("id", { length: 255 }).primaryKey(),
-
-    /** Billing provider ID (e.g., 'polar', 'stripe') */
-    providerId: varchar("provider_id", { length: 50 }).notNull(),
-
-    /** Internal metric ID */
-    metricId: varchar("metric_id", { length: 100 }).notNull(),
-
-    /** External meter ID in the provider */
-    externalMeterId: varchar("external_meter_id", { length: 255 }).notNull(),
-
-    /** External meter slug (Polar-specific) */
-    externalMeterSlug: varchar("external_meter_slug", { length: 255 }),
-
-    lastSyncedAt: timestamp("last_synced_at", { withTimezone: true, precision: 3 }),
-    createdAt: timestamp("created_at", { withTimezone: true, precision: 3 }).defaultNow(),
-    updatedAt: timestamp("updated_at", { withTimezone: true, precision: 3 }).$onUpdate(
-      () => new Date(),
-    ),
-  },
-  (table) => [uniqueIndex("provider_metric_unique_idx").on(table.providerId, table.metricId)],
-);
-
 // ============================================
 // WEBHOOK TABLES
 // ============================================
diff --git a/packages/db/src/types.ts b/packages/db/src/types.ts
index 720cee400..59bf2bca3 100644
--- a/packages/db/src/types.ts
+++ b/packages/db/src/types.ts
@@ -127,27 +127,10 @@ export type PaywallLocationShowing = InferSelectModel<typeof schema.paywallLocat
 export type InsertPaywallLocationShowing = InferInsertModel<typeof schema.paywallLocationShowings>;
 export type UpdatePaywallLocationShowing = InferUpdateModel<typeof schema.paywallLocationShowings>;
 
-// Billing Types
-export type OrganizationBilling = InferSelectModel<typeof schema.organizationBilling>;
-export type InsertOrganizationBilling = InferInsertModel<typeof schema.organizationBilling>;
-export type UpdateOrganizationBilling = InferUpdateModel<typeof schema.organizationBilling>;
-
-export type UsageRecord = InferSelectModel<typeof schema.usageRecords>;
-export type InsertUsageRecord = InferInsertModel<typeof schema.usageRecords>;
-
-export type UsageAggregate = InferSelectModel<typeof schema.usageAggregates>;
-export type InsertUsageAggregate = InferInsertModel<typeof schema.usageAggregates>;
-export type UpdateUsageAggregate = InferUpdateModel<typeof schema.usageAggregates>;
-
-export type BillingWebhookEvent = InferSelectModel<typeof schema.billingWebhookEvents>;
-export type InsertBillingWebhookEvent = InferInsertModel<typeof schema.billingWebhookEvents>;
-
+// WorkOS Webhook Types
 export type WorkosWebhookEvent = InferSelectModel<typeof schema.workosWebhookEvents>;
 export type InsertWorkosWebhookEvent = InferInsertModel<typeof schema.workosWebhookEvents>;
 
-export type BillingProviderMeter = InferSelectModel<typeof schema.billingProviderMeters>;
-export type InsertBillingProviderMeter = InferInsertModel<typeof schema.billingProviderMeters>;
-
 // Feature Flag Types
 export type FeatureFlag = InferSelectModel<typeof schema.featureFlags>;
 export type InsertFeatureFlag = InferInsertModel<typeof schema.featureFlags>;
diff --git a/packages/shared/src/billing.ts b/packages/shared/src/billing.ts
deleted file mode 100644
index c900b4ba7..000000000
--- a/packages/shared/src/billing.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// Errors have been moved to:
-// - @voidhash/generated-clients (API layer)
-// - @voidhash/core/domain/errors (domain layer)
diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
index dfc4f62fd..9c5968fe1 100644
--- a/packages/shared/src/index.ts
+++ b/packages/shared/src/index.ts
@@ -3,7 +3,6 @@ export * from "./analytics";
 export * from "./api-key";
 export * from "./app-store";
 export * from "./auth";
-export * from "./billing";
 export * from "./customer";
 export * from "./deploy-changeset";
 export * from "./errors";
diff --git a/selfhost/smoke.mts b/selfhost/smoke.mts
index 80ffb8a52..e5a4c12e5 100644
--- a/selfhost/smoke.mts
+++ b/selfhost/smoke.mts
@@ -26,10 +26,7 @@ const assertApplicationSurface = async (): Promise<void> => {
     throw new Error(`Runtime capabilities returned ${capabilitiesResponse.status}`);
   }
   const capabilities = await capabilitiesResponse.json();
-  if (
-    JSON.stringify(capabilities) !==
-    JSON.stringify({ enterprise: { auditLogs: false, billing: false } })
-  ) {
+  if (JSON.stringify(capabilities) !== JSON.stringify({ enterprise: {} })) {
     throw new Error(`Unexpected Community capabilities: ${JSON.stringify(capabilities)}`);
   }
 
diff --git a/turbo.json b/turbo.json
index 226ab3161..9f0a60ec7 100644
--- a/turbo.json
+++ b/turbo.json
@@ -18,7 +18,6 @@
         "DATABASE_PASSWORD",
         "DATABASE_NAME",
         "VOIDHASH_SECRET_KEY",
-        "POLAR_ACCESS_TOKEN",
         "GITHUB_CLIENT_ID",
         "GITHUB_CLIENT_SECRET",
         "WORKOS_AUTHKIT_DOMAIN",