diff --git a/src/client/pages/DeveloperDashboard.tsx b/src/client/pages/DeveloperDashboard.tsx
index 0987d15..5eee8fe 100644
--- a/src/client/pages/DeveloperDashboard.tsx
+++ b/src/client/pages/DeveloperDashboard.tsx
@@ -419,7 +419,7 @@ export const DeveloperDashboard: React.FC = () => {
                                                         </h3>
                                                         <div className="space-y-2">
                                                             {admins.map(admin => (
-                                                                <div key={admin.clerkUserId} className="flex items-center gap-3 p-2 bg-surface rounded-lg border border-indigo-500/20">
+                                                                <div key={admin.userId} className="flex items-center gap-3 p-2 bg-surface rounded-lg border border-indigo-500/20">
                                                                     <div className="w-8 h-8 rounded-full bg-indigo-500/20 flex items-center justify-center text-indigo-500 font-bold text-xs">
                                                                         {admin.name.charAt(0).toUpperCase()}
                                                                     </div>
@@ -441,7 +441,7 @@ export const DeveloperDashboard: React.FC = () => {
                                                         </h3>
                                                         <div className="space-y-2">
                                                             {commonUsers.map(user => (
-                                                                <div key={user.clerkUserId} className="flex items-center gap-3 p-2 bg-surface rounded-lg border border-border/40">
+                                                                <div key={user.userId} className="flex items-center gap-3 p-2 bg-surface rounded-lg border border-border/40">
                                                                     <div className={clsx(
                                                                         "w-8 h-8 rounded-full flex items-center justify-center font-bold text-xs",
                                                                         user.role === 'user' ? "bg-green-500/10 text-green-500" : "bg-gray-500/10 text-gray-500"
diff --git a/src/client/pages/OrganizationSelector.tsx b/src/client/pages/OrganizationSelector.tsx
deleted file mode 100644
index d3f8747..0000000
--- a/src/client/pages/OrganizationSelector.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import React, { useEffect } from 'react';
-import { useNavigate } from 'react-router-dom';
-
-/**
- * @deprecated Clerk legacy component. No longer used in Logto flow.
- */
-export const OrganizationSelector: React.FC = () => {
-    const navigate = useNavigate();
-
-    useEffect(() => {
-        navigate('/', { replace: true });
-    }, [navigate]);
-
-    return null;
-};
diff --git a/src/client/services/systemSettingsService.ts b/src/client/services/systemSettingsService.ts
index c7e18b0..79a0792 100644
--- a/src/client/services/systemSettingsService.ts
+++ b/src/client/services/systemSettingsService.ts
@@ -15,7 +15,7 @@ export const systemSettingsService = {
     },
 
     updateSettings: async (settings: Partial<SystemSettings>): Promise<SystemSettings> => {
-        // Axios interceptors in api.ts automatically handle x-clerk-user-id and x-organization-id headers
+        // Axios interceptors handle organization-id headers
         const response = await api.put('/system-settings', settings);
         return response.data;
     },
@@ -51,7 +51,7 @@ export const systemSettingsService = {
 
 export interface GlobalUser {
     _id: string;
-    clerkId: string;
+    id: string;
     name: string;
     email: string;
     role: string;
@@ -69,7 +69,7 @@ export interface GlobalOrganization {
         name: string;
         email: string;
         role: 'admin' | 'user' | 'guest';
-        clerkUserId: string;
+        userId: string;
         isBanned: boolean;
     }[];
 }
diff --git a/src/client/types.ts b/src/client/types.ts
index 9a314ff..67e8ac0 100644
--- a/src/client/types.ts
+++ b/src/client/types.ts
@@ -190,7 +190,6 @@ export type UserRole = 'guest' | 'user' | 'admin';
 export interface AppUser {
     id: string;
     _id?: string;
-    clerkId?: string;
     logtoId?: string;
     email: string;
     name: string;