@@ -8,7 +8,6 @@ import {
   useState,
   type ComponentType,
   type KeyboardEvent,
-  type ReactNode,
 } from "react";
 import {
   ArchiveIcon,
@@ -24,32 +23,22 @@ import {
   Settings2Icon,
   XIcon,
 } from "lucide-react";
-import { useLocation, useNavigate, useRouterState } from "@tanstack/react-router";
+import { useLocation, useNavigate } from "@tanstack/react-router";
 
 import { Button } from "../ui/button";
-import { Collapsible, CollapsiblePanel } from "../ui/collapsible";
 import { Input } from "../ui/input";
 import { Kbd } from "../ui/kbd";
-import { cn } from "../../lib/utils";
 import {
   SidebarContent,
   SidebarFooter,
   SidebarGroup,
   SidebarMenu,
   SidebarMenuButton,
   SidebarMenuItem,
-  SidebarMenuSub,
-  SidebarMenuSubButton,
-  SidebarMenuSubItem,
   useSidebar,
 } from "../ui/sidebar";
 import { SidebarUtilityMenu } from "../sidebar/SidebarChrome";
 import { scrollToSettingsTarget } from "./settingsLayout";
-import {
-  getVisibleSettingsSectionIds,
-  observeSettingsSectionVisibility,
-  type SettingsSectionVisibilityState,
-} from "./settingsSectionVisibility";
 import {
   searchSettings,
   SETTINGS_SECTION_LABELS,
@@ -106,102 +95,22 @@ const SETTINGS_NAV_ITEMS: ReadonlyArray<{
   icon: SETTINGS_SECTION_ICONS[to],
 }));
 
-const SETTINGS_PAGE_SECTIONS: Partial<
-  Readonly<Record<SettingsPath, ReadonlyArray<{ label: string; targetId: string }>>>
-> = {
-  "/settings/general": [
-    { label: "Organization", targetId: "organization" },
-    { label: "Behavior", targetId: "behavior" },
-    { label: "Projects & threads", targetId: "projects-and-threads" },
-    { label: "Confirmations", targetId: "confirmations" },
-    { label: "Text generation", targetId: "text-generation" },
-    { label: "About", targetId: "about" },
-    { label: "Legacy features", targetId: "legacy-features" },
-  ],
-  "/settings/appearance": [
-    { label: "Colors & themes", targetId: "appearance" },
-    { label: "Interface", targetId: "appearance-interface" },
-    { label: "Motion", targetId: "motion" },
-    { label: "Typography", targetId: "typography" },
-  ],
-  "/settings/source-control": [
-    { label: "Version control", targetId: "source-control" },
-    { label: "Text generation", targetId: "source-control-text-generation" },
-  ],
-  "/settings/connections": [
-    { label: "This environment", targetId: "connections-environment" },
-    { label: "Remote environments", targetId: "remote-environments" },
-  ],
-};
-
 function SettingsSectionIcon({ to }: { to: SettingsPath }) {
   const Icon = SETTINGS_SECTION_ICONS[to];
   return <Icon className="mt-0.5 size-3.5 shrink-0 text-sidebar-muted-foreground/60" />;
 }
 
-function SettingsSubmenuCollapse({
-  open,
-  children,
-}: {
-  readonly open: boolean;
-  readonly children: ReactNode;
-}) {
-  return (
-    <Collapsible open={open}>
-      <CollapsiblePanel className="duration-150 ease-out motion-reduce:transition-none">
-        {children}
-      </CollapsiblePanel>
-    </Collapsible>
-  );
-}
-
 export function SettingsSidebarNav({ pathname }: { pathname: string }) {
   const navigate = useNavigate();
   const currentHash = useLocation({ select: (location) => location.hash });
-  const resolvedPathname = useRouterState({
-    select: (state) => state.resolvedLocation?.pathname,
-  });
   const { isMobile, setOpenMobile, open, setOpen } = useSidebar();
   const searchInputRef = useRef<HTMLInputElement>(null);
   const [query, setQuery] = useState("");
   const [activeResultIndex, setActiveResultIndex] = useState(0);
-  const [sectionVisibility, setSectionVisibility] = useState<SettingsSectionVisibilityState | null>(
-    null,
-  );
   const searchableItems = useAvailableSettingsSearchItems();
   const results = useMemo(() => searchSettings(query, searchableItems), [query, searchableItems]);
   const isSearching = query.trim().length > 0;
   const hasResults = results.length > 0;
-  const activeSettingsPath = SETTINGS_NAV_ITEMS.find(
-    (item) => pathname === item.to || pathname.startsWith(`${item.to}/`),
-  )?.to;
-  const observedVisibilityScope = useMemo(() => {
-    const path = SETTINGS_NAV_ITEMS.find(
-      (item) =>
-        resolvedPathname === item.to || resolvedPathname?.startsWith(`${item.to}/`) === true,
-    )?.to;
-    const pageSections = path ? SETTINGS_PAGE_SECTIONS[path] : undefined;
-    return path && pageSections ? { path, pageSections } : null;
-  }, [resolvedPathname]);
-  const visiblePageSectionIds = getVisibleSettingsSectionIds({
-    activePath: activeSettingsPath,
-    scope: observedVisibilityScope,
-    visibility: sectionVisibility,
-  });
-
-  useEffect(() => {
-    if (!observedVisibilityScope) return;
-    const container = document.querySelector<HTMLElement>("[data-settings-page-layout]");
-    if (!container) return;
-
-    return observeSettingsSectionVisibility({
-      container,
-      targetIds: observedVisibilityScope.pageSections.map((section) => section.targetId),
-      onChange(targetIds) {
-        setSectionVisibility({ scope: observedVisibilityScope, targetIds: new Set(targetIds) });
-      },
-    });
-  }, [observedVisibilityScope]);
 
   useEffect(() => {
     setActiveResultIndex((index) => Math.min(index, Math.max(results.length - 1, 0)));
@@ -261,24 +170,6 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
     },
     [isMobile, navigate, setOpenMobile],
   );
-  const handlePageSectionClick = useCallback(
-    (to: SettingsPath, targetId: string) => {
-      if (isMobile) {
-        setOpenMobile(false);
-      }
-      if (pathname === to && scrollToSettingsTarget(targetId, { highlight: false })) {
-        return;
-      }
-      void navigate({
-        to,
-        hash: targetId,
-        replace: true,
-        hashScrollIntoView: false,
-        state: { settingsTargetHighlight: false },
-      });
-    },
-    [isMobile, navigate, pathname, setOpenMobile],
-  );
   const clearSearch = useCallback(() => {
     setQuery("");
     setActiveResultIndex(0);
@@ -430,8 +321,7 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
             <SidebarMenu className="ps-px">
               {SETTINGS_NAV_ITEMS.map((item) => {
                 const Icon = item.icon;
-                const pageSections = SETTINGS_PAGE_SECTIONS[item.to];
-                const isActive = activeSettingsPath === item.to;
+                const isActive = pathname === item.to || pathname.startsWith(`${item.to}/`);
                 return (
                   <SidebarMenuItem key={item.to}>
                     <SidebarMenuButton
@@ -441,29 +331,6 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
                       <Icon />
                       <span className="truncate">{item.label}</span>
                     </SidebarMenuButton>
-                    {pageSections ? (
-                      <SettingsSubmenuCollapse open={isActive}>
-                        <SidebarMenuSub className="border-l-0">
-                          {pageSections.map((section) => (
-                            <SidebarMenuSubItem key={section.targetId}>
-                              <SidebarMenuSubButton
-                                render={<button type="button" />}
-                                size="sm"
-                                data-visible={visiblePageSectionIds.has(section.targetId)}
-                                className={cn(
-                                  "w-full text-sidebar-muted-foreground/65",
-                                  visiblePageSectionIds.has(section.targetId) &&
-                                    "font-medium text-sidebar-foreground",
-                                )}
-                                onClick={() => handlePageSectionClick(item.to, section.targetId)}
-                              >
-                                <span className="ms-0.5">{section.label}</span>
-                              </SidebarMenuSubButton>
-                            </SidebarMenuSubItem>
-                          ))}
-                        </SidebarMenuSub>
-                      </SettingsSubmenuCollapse>
-                    ) : null}
                   </SidebarMenuItem>
                 );
               })}