diff --git a/apps/client/src/App.tsx b/apps/client/src/App.tsx
index 99d579df..f34e8e39 100644
--- a/apps/client/src/App.tsx
+++ b/apps/client/src/App.tsx
@@ -36,15 +36,7 @@ import SpacesPage from "@/pages/spaces/spaces.tsx";
 import { MfaChallengePage } from "@/ee/mfa/pages/mfa-challenge-page";
 import { MfaSetupRequiredPage } from "@/ee/mfa/pages/mfa-setup-required-page";
 import SpaceTrash from "@/pages/space/space-trash.tsx";
-import UserApiKeys from "@/ee/api-key/pages/user-api-keys";
-import WorkspaceApiKeys from "@/ee/api-key/pages/workspace-api-keys";
-import AiSettings from "@/ee/ai/pages/ai-settings.tsx";
-import AuditLogs from "@/ee/audit/pages/audit-logs.tsx";
-import VerifiedPages from "@/ee/page-verification/pages/verified-pages.tsx";
-import TemplateList from "@/ee/template/pages/template-list";
-import TemplateEditor from "@/ee/template/pages/template-editor";
 import FavoritesPage from "@/pages/favorites/favorites-page";
-import AiChat from "@/ee/ai-chat/pages/ai-chat.tsx";
 import VerifyEmail from "@/ee/pages/verify-email.tsx";
 import RolesListPage from "@/features/acadenice/rbac/pages/roles-list.page";
 import RoleDetailPage from "@/features/acadenice/rbac/pages/role-detail.page";
@@ -113,15 +105,9 @@ export default function App() {
           <Route path={"/graph"} element={<GraphPage />} />
           {/* Acadenice R3.7 — notifications full page */}
           <Route path={"/notifications"} element={<AcadeniceNotificationsPage />} />
-          <Route path={"/ai"} element={<AiChat />} />
-          <Route path={"/ai/chat/:chatId"} element={<AiChat />} />
           <Route path={"/spaces"} element={<SpacesPage />} />
           <Route path={"/favorites"} element={<FavoritesPage />} />
-          <Route path={"/templates"} element={<TemplateList />} />
-          <Route
-            path={"/templates/:templateId"}
-            element={<TemplateEditor />}
-          />
+          <Route path={"/templates"} element={<TemplatesAdminPage />} />
           <Route path={"/s/:spaceSlug"} element={<SpaceHome />} />
           <Route path={"/s/:spaceSlug/trash"} element={<SpaceTrash />} />
           {/* Acadenice R4.6 — space-scoped graph view */}
@@ -137,19 +123,15 @@ export default function App() {
               path={"account/preferences"}
               element={<AccountPreferences />}
             />
-            <Route path={"account/api-keys"} element={<UserApiKeys />} />
             <Route path={"workspace"} element={<WorkspaceSettings />} />
             <Route path={"members"} element={<WorkspaceMembers />} />
-            <Route path={"api-keys"} element={<WorkspaceApiKeys />} />
+            <Route path={"api-keys"} element={<AcadeniceApiKeysPage />} />
             <Route path={"groups"} element={<Groups />} />
             <Route path={"groups/:groupId"} element={<GroupInfo />} />
             <Route path={"spaces"} element={<Spaces />} />
             <Route path={"sharing"} element={<Shares />} />
             <Route path={"security"} element={<Security />} />
-            <Route path={"ai"} element={<AiSettings />} />
-            <Route path={"ai/mcp"} element={<AiSettings />} />
-            <Route path={"audit"} element={<AuditLogs />} />
-            <Route path={"verifications"} element={<VerifiedPages />} />
+            <Route path={"audit"} element={<AcadeniceAuditLogPage />} />
             {/* Acadenice R2.2 — RBAC dynamique */}
             <Route path={"roles"} element={<RolesListPage />} />
             <Route path={"roles/:id"} element={<RoleDetailPage />} />
diff --git a/apps/client/src/components/settings/settings-sidebar.tsx b/apps/client/src/components/settings/settings-sidebar.tsx
index 747edfc1..666214f2 100644
--- a/apps/client/src/components/settings/settings-sidebar.tsx
+++ b/apps/client/src/components/settings/settings-sidebar.tsx
@@ -149,31 +149,15 @@ const groupedData: DataGroup[] = [
       { label: "Spaces", icon: IconSpaces, path: "/settings/spaces" },
       { label: "Public sharing", icon: IconWorld, path: "/settings/sharing" },
       {
-        label: "Verified pages",
-        icon: IconShieldCheck,
-        path: "/settings/verifications",
-        feature: Feature.PAGE_VERIFICATION,
-      },
-      {
-        // Acadenice R4.5 — workspace-level API keys view removed (use account-level)
-        // kept here for EE environments but hidden on open source installs
         label: "API management",
         icon: IconKey,
         path: "/settings/api-keys",
-        feature: Feature.API_KEYS,
         role: "admin",
       },
       {
-        label: "AI settings",
-        icon: IconSparkles,
-        path: "/settings/ai",
-        role: "admin",
-      },
-      {
-        // Acadenice R4.5 — open source audit log (replaces EE-gated page)
         label: "Audit log",
         icon: IconHistory,
-        path: "/settings/acadenice/audit-log",
+        path: "/settings/audit",
         role: "admin",
         env: "selfhosted",
       },