diff --git a/src/components/layout/AppSidebar.vue b/src/components/layout/AppSidebar.vue
index 351ef6a..80606eb 100644
--- a/src/components/layout/AppSidebar.vue
+++ b/src/components/layout/AppSidebar.vue
@@ -9,7 +9,7 @@ import {
   Calendar,
   ShoppingBag,
   MessageSquare,
-  Settings,
+  // Settings, // TODO: Uncomment when Settings page is implemented
   Sun,
   Moon
 } from 'lucide-vue-next'
@@ -115,7 +115,7 @@ const isActive = (href: string) => {
             <LanguageSwitcher />
           </div>
 
-          <!-- Settings Link -->
+          <!-- TODO: Review implementing Settings page in the future
           <router-link
             to="/settings"
             :class="[
@@ -128,6 +128,7 @@ const isActive = (href: string) => {
             <Settings class="h-5 w-5 shrink-0" />
             Settings
           </router-link>
+          -->
         </li>
       </ul>
     </nav>
diff --git a/src/components/layout/MobileDrawer.vue b/src/components/layout/MobileDrawer.vue
index 20c4dad..87b2dd1 100644
--- a/src/components/layout/MobileDrawer.vue
+++ b/src/components/layout/MobileDrawer.vue
@@ -10,13 +10,13 @@ import {
   SheetTitle,
 } from '@/components/ui/sheet'
 import { Button } from '@/components/ui/button'
-import { Separator } from '@/components/ui/separator'
+// import { Separator } from '@/components/ui/separator' // TODO: Uncomment when Settings page is implemented
 import {
   Home,
   Calendar,
   ShoppingBag,
   MessageSquare,
-  Settings,
+  // Settings, // TODO: Uncomment when Settings page is implemented
   Sun,
   Moon,
 } from 'lucide-vue-next'
@@ -136,9 +136,9 @@ const navigateTo = (href: string) => {
             <LanguageSwitcher />
           </div>
 
+          <!-- TODO: Review implementing Settings page in the future
           <Separator />
 
-          <!-- Settings Link -->
           <button
             @click="navigateTo('/settings')"
             :class="[
@@ -151,6 +151,7 @@ const navigateTo = (href: string) => {
             <Settings class="h-5 w-5 shrink-0" />
             Settings
           </button>
+          -->
         </div>
       </div>
     </SheetContent>
diff --git a/src/composables/useModularNavigation.ts b/src/composables/useModularNavigation.ts
index af47f66..e48f209 100644
--- a/src/composables/useModularNavigation.ts
+++ b/src/composables/useModularNavigation.ts
@@ -79,13 +79,13 @@ export function useModularNavigation() {
       })
     }
 
-    // Base module items (always available)
-    items.push({ 
-      name: 'Relay Hub Status', 
-      href: '/relay-hub-status', 
-      icon: 'Activity',
-      requiresAuth: true 
-    })
+    // TODO: Review implementing Relay Hub Status page in the future
+    // items.push({
+    //   name: 'Relay Hub Status',
+    //   href: '/relay-hub-status',
+    //   icon: 'Activity',
+    //   requiresAuth: true
+    // })
 
     return items
   })