diff --git a/surfsense_web/app/dashboard/[search_space_id]/settings/layout.tsx b/surfsense_web/app/dashboard/[search_space_id]/settings/layout.tsx
deleted file mode 100644
index e5fa6be12..000000000
--- a/surfsense_web/app/dashboard/[search_space_id]/settings/layout.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import type React from "react";
-
-export default function SettingsLayout({ children }: { children: React.ReactNode }) {
-	return <>{children}</>;
-}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/settings/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/settings/page.tsx
deleted file mode 100644
index 971c82e4d..000000000
--- a/surfsense_web/app/dashboard/[search_space_id]/settings/page.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-"use client";
-
-import { Bot, Brain, FileText, Globe, ImageIcon, MessageSquare, Shield } from "lucide-react";
-import { useParams, useRouter, useSearchParams } from "next/navigation";
-import { useTranslations } from "next-intl";
-import { useCallback, useEffect } from "react";
-import { PublicChatSnapshotsManager } from "@/components/public-chat-snapshots/public-chat-snapshots-manager";
-import { GeneralSettingsManager } from "@/components/settings/general-settings-manager";
-import { ImageModelManager } from "@/components/settings/image-model-manager";
-import { LLMRoleManager } from "@/components/settings/llm-role-manager";
-import { ModelConfigManager } from "@/components/settings/model-config-manager";
-import { PromptConfigManager } from "@/components/settings/prompt-config-manager";
-import { RolesManager } from "@/components/settings/roles-manager";
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/animated-tabs";
-import { trackSettingsViewed } from "@/lib/posthog/events";
-
-const VALID_TABS = [
-	"general",
-	"models",
-	"roles",
-	"image-models",
-	"prompts",
-	"public-links",
-	"team-roles",
-] as const;
-
-const DEFAULT_TAB = "general";
-
-export default function SettingsPage() {
-	const t = useTranslations("searchSpaceSettings");
-	const router = useRouter();
-	const params = useParams();
-	const searchParams = useSearchParams();
-	const searchSpaceId = Number(params.search_space_id);
-
-	const tabParam = searchParams.get("tab") ?? "";
-	const activeTab = VALID_TABS.includes(tabParam as (typeof VALID_TABS)[number])
-		? tabParam
-		: DEFAULT_TAB;
-
-	const handleTabChange = useCallback(
-		(value: string) => {
-			const p = new URLSearchParams(searchParams.toString());
-			p.set("tab", value);
-			router.replace(`?${p.toString()}`, { scroll: false });
-		},
-		[router, searchParams]
-	);
-
-	useEffect(() => {
-		trackSettingsViewed(searchSpaceId, activeTab);
-	}, [searchSpaceId, activeTab]);
-
-	return (
-		<div className="h-full overflow-y-auto">
-			<div className="mx-auto w-full max-w-4xl px-4 py-10">
-				<Tabs value={activeTab} onValueChange={handleTabChange} className="w-full">
-					<TabsList showBottomBorder>
-						<TabsTrigger value="general">
-							<FileText className="mr-2 h-4 w-4" />
-							{t("nav_general")}
-						</TabsTrigger>
-						<TabsTrigger value="models">
-							<Bot className="mr-2 h-4 w-4" />
-							{t("nav_agent_configs")}
-						</TabsTrigger>
-						<TabsTrigger value="roles">
-							<Brain className="mr-2 h-4 w-4" />
-							{t("nav_role_assignments")}
-						</TabsTrigger>
-						<TabsTrigger value="image-models">
-							<ImageIcon className="mr-2 h-4 w-4" />
-							{t("nav_image_models")}
-						</TabsTrigger>
-						<TabsTrigger value="team-roles">
-							<Shield className="mr-2 h-4 w-4" />
-							{t("nav_team_roles")}
-						</TabsTrigger>
-					<TabsTrigger value="prompts">
-						<MessageSquare className="mr-2 h-4 w-4" />
-						{t("nav_system_instructions")}
-					</TabsTrigger>
-					<TabsTrigger value="public-links">
-						<Globe className="mr-2 h-4 w-4" />
-						{t("nav_public_links")}
-					</TabsTrigger>
-				</TabsList>
-					<TabsContent value="general" className="mt-6">
-						<GeneralSettingsManager searchSpaceId={searchSpaceId} />
-					</TabsContent>
-					<TabsContent value="models" className="mt-6">
-						<ModelConfigManager searchSpaceId={searchSpaceId} />
-					</TabsContent>
-					<TabsContent value="roles" className="mt-6">
-						<LLMRoleManager searchSpaceId={searchSpaceId} />
-					</TabsContent>
-					<TabsContent value="image-models" className="mt-6">
-						<ImageModelManager searchSpaceId={searchSpaceId} />
-					</TabsContent>
-					<TabsContent value="prompts" className="mt-6">
-						<PromptConfigManager searchSpaceId={searchSpaceId} />
-					</TabsContent>
-					<TabsContent value="public-links" className="mt-6">
-						<PublicChatSnapshotsManager searchSpaceId={searchSpaceId} />
-					</TabsContent>
-					<TabsContent value="team-roles" className="mt-6">
-						<RolesManager searchSpaceId={searchSpaceId} />
-					</TabsContent>
-				</Tabs>
-			</div>
-		</div>
-	);
-}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/team/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/team/page.tsx
deleted file mode 100644
index 5f39460f0..000000000
--- a/surfsense_web/app/dashboard/[search_space_id]/team/page.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-"use client";
-
-import { useParams } from "next/navigation";
-import { TeamContent } from "./team-content";
-
-export default function TeamManagementPage() {
-	const params = useParams();
-	const searchSpaceId = Number(params.search_space_id);
-
-	return (
-		<div className="bg-background select-none">
-			<div className="container max-w-5xl mx-auto p-4 md:p-6 lg:p-8 pt-20 md:pt-24 lg:pt-28">
-				<TeamContent searchSpaceId={searchSpaceId} />
-			</div>
-		</div>
-	);
-}
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/page.tsx
deleted file mode 100644
index 8cdfdc178..000000000
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/page.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-"use client";
-
-import { User, UserKey } from "lucide-react";
-import { useRouter, useSearchParams } from "next/navigation";
-import { useTranslations } from "next-intl";
-import { useCallback } from "react";
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/animated-tabs";
-import { ApiKeyContent } from "./components/ApiKeyContent";
-import { ProfileContent } from "./components/ProfileContent";
-
-const VALID_TABS = ["profile", "api-key"] as const;
-const DEFAULT_TAB = "profile";
-
-export default function UserSettingsPage() {
-	const t = useTranslations("userSettings");
-	const router = useRouter();
-	const searchParams = useSearchParams();
-
-	const tabParam = searchParams.get("tab") ?? "";
-	const activeTab = VALID_TABS.includes(tabParam as (typeof VALID_TABS)[number])
-		? tabParam
-		: DEFAULT_TAB;
-
-	const handleTabChange = useCallback(
-		(value: string) => {
-			const params = new URLSearchParams(searchParams.toString());
-			params.set("tab", value);
-			router.replace(`?${params.toString()}`, { scroll: false });
-		},
-		[router, searchParams]
-	);
-
-	return (
-		<div className="h-full overflow-y-auto">
-			<div className="mx-auto w-full max-w-4xl px-4 py-10">
-				<Tabs value={activeTab} onValueChange={handleTabChange} className="w-full">
-					<TabsList showBottomBorder>
-						<TabsTrigger value="profile">
-							<User className="mr-2 h-4 w-4" />
-							{t("profile_nav_label")}
-						</TabsTrigger>
-						<TabsTrigger value="api-key">
-							<UserKey className="mr-2 h-4 w-4" />
-							{t("api_key_nav_label")}
-						</TabsTrigger>
-					</TabsList>
-					<TabsContent value="profile" className="mt-6">
-						<ProfileContent />
-					</TabsContent>
-					<TabsContent value="api-key" className="mt-6">
-						<ApiKeyContent />
-					</TabsContent>
-				</Tabs>
-			</div>
-		</div>
-	);
-}