diff --git a/src/App.tsx b/src/App.tsx
index f5227c26..80ac8460 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -3,23 +3,20 @@ import { Toaster } from "@/components/ui/toaster";
 import { Toaster as Sonner } from "@/components/ui/sonner";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
+import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { BrowserRouter, Routes, Route } from "react-router-dom";
 import { AuthProvider } from "@/hooks/useAuth";
 import { LocationAutoDetectProvider } from "@/components/providers/LocationAutoDetectProvider";
-import { AuthModalProvider } from "@/contexts/AuthModalContext";
 import { Footer } from "@/components/layout/Footer";
 import Index from "./pages/Index";
 import Parks from "./pages/Parks";
 import ParkDetail from "./pages/ParkDetail";
-import ParkRides from "./pages/ParkRides";
 import RideDetail from "./pages/RideDetail";
 import Rides from "./pages/Rides";
 import Manufacturers from "./pages/Manufacturers";
 import ManufacturerDetail from "./pages/ManufacturerDetail";
 import ManufacturerRides from "./pages/ManufacturerRides";
 import ManufacturerModels from "./pages/ManufacturerModels";
-import RideModelDetail from "./pages/RideModelDetail";
 import Designers from "./pages/Designers";
 import DesignerDetail from "./pages/DesignerDetail";
 import DesignerRides from "./pages/DesignerRides";
@@ -55,9 +52,9 @@ const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
       refetchOnWindowFocus: false, // Disable automatic refetch on tab focus
-      refetchOnMount: true,         // Keep refetch on component mount
-      refetchOnReconnect: true,     // Keep refetch on network reconnect
-      retry: 1,                     // Keep retry attempts
+      refetchOnMount: true, // Keep refetch on component mount
+      refetchOnReconnect: true, // Keep refetch on network reconnect
+      retry: 1, // Keep retry attempts
       staleTime: 30000, // 30 seconds - queries stay fresh for 30s
       gcTime: 5 * 60 * 1000, // 5 minutes - keep in cache for 5 mins
     },
@@ -71,73 +68,66 @@ function AppContent() {
         <LocationAutoDetectProvider />
         <Toaster />
         <Sonner />
-          <div className="min-h-screen flex flex-col">
-            <div className="flex-1">
-              <Routes>
-                <Route path="/" element={<Index />} />
-            <Route path="/parks" element={<Parks />} />
-            <Route path="/parks/:slug" element={<ParkDetail />} />
-            <Route path="/parks/:parkSlug/rides" element={<ParkRides />} />
-            <Route path="/parks/:parkSlug/rides/:rideSlug" element={<RideDetail />} />
-                <Route path="/rides" element={<Rides />} />
-                <Route path="/search" element={<Search />} />
-                <Route path="/blog" element={<BlogIndex />} />
-                <Route path="/blog/:slug" element={<BlogPost />} />
-                <Route path="/manufacturers" element={<Manufacturers />} />
-                <Route path="/manufacturers/:slug" element={<ManufacturerDetail />} />
-                <Route path="/manufacturers/:manufacturerSlug/rides" element={<ManufacturerRides />} />
-                <Route path="/manufacturers/:manufacturerSlug/models" element={<ManufacturerModels />} />
-                <Route path="/manufacturers/:manufacturerSlug/models/:modelSlug" element={<RideModelDetail />} />
-                <Route path="/designers" element={<Designers />} />
-                <Route path="/designers/:slug" element={<DesignerDetail />} />
-                <Route path="/designers/:designerSlug/rides" element={<DesignerRides />} />
-                <Route path="/owners" element={<ParkOwners />} />
-                <Route path="/owners/:slug" element={<PropertyOwnerDetail />} />
-                <Route path="/owners/:ownerSlug/parks" element={<OwnerParks />} />
-                <Route path="/operators" element={<Operators />} />
-                <Route path="/operators/:slug" element={<OperatorDetail />} />
-                <Route path="/operators/:operatorSlug/parks" element={<OperatorParks />} />
-                <Route path="/auth" element={<Auth />} />
-                <Route path="/auth/callback" element={<AuthCallback />} />
-                <Route path="/auth/mfa-step-up" element={<MFAStepUp />} />
-                <Route path="/profile" element={<Profile />} />
-                <Route path="/profile/:username" element={<Profile />} />
-                <Route path="/settings" element={<UserSettings />} />
-                <Route path="/admin" element={<AdminDashboard />} />
-                <Route path="/admin/moderation" element={<AdminModeration />} />
-                <Route path="/admin/reports" element={<AdminReports />} />
-                <Route path="/admin/system-log" element={<AdminSystemLog />} />
-                <Route path="/admin/users" element={<AdminUsers />} />
-                <Route path="/admin/blog" element={<AdminBlog />} />
-                <Route path="/admin/settings" element={<AdminSettings />} />
-                <Route path="/terms" element={<Terms />} />
-                <Route path="/privacy" element={<Privacy />} />
-                <Route path="/submission-guidelines" element={<SubmissionGuidelines />} />
-                <Route path="/force-logout" element={<ForceLogout />} />
-                {/* ADD ALL CUSTOM ROUTES ABOVE THE CATCH-ALL "*" ROUTE */}
-                <Route path="*" element={<NotFound />} />
-              </Routes>
-            </div>
-            <Footer />
+        <div className="min-h-screen flex flex-col">
+          <div className="flex-1">
+            <Routes>
+              <Route path="/" element={<Index />} />
+              <Route path="/parks" element={<Parks />} />
+              <Route path="/parks/:slug" element={<ParkDetail />} />
+              <Route path="/parks/:parkSlug/rides/:rideSlug" element={<RideDetail />} />
+              <Route path="/rides" element={<Rides />} />
+              <Route path="/search" element={<Search />} />
+              <Route path="/blog" element={<BlogIndex />} />
+              <Route path="/blog/:slug" element={<BlogPost />} />
+              <Route path="/manufacturers" element={<Manufacturers />} />
+              <Route path="/manufacturers/:slug" element={<ManufacturerDetail />} />
+              <Route path="/manufacturers/:manufacturerSlug/rides" element={<ManufacturerRides />} />
+              <Route path="/manufacturers/:manufacturerSlug/models" element={<ManufacturerModels />} />
+              <Route path="/manufacturers/:manufacturerSlug/models/:modelSlug" element={<RideModelDetail />} />
+              <Route path="/manufacturers/:manufacturerSlug/models/:modelSlug/rides" element={<RideModelRides />} />
+              <Route path="/designers" element={<Designers />} />
+              <Route path="/designers/:slug" element={<DesignerDetail />} />
+              <Route path="/designers/:designerSlug/rides" element={<DesignerRides />} />
+              <Route path="/owners" element={<ParkOwners />} />
+              <Route path="/owners/:slug" element={<PropertyOwnerDetail />} />
+              <Route path="/owners/:ownerSlug/parks" element={<OwnerParks />} />
+              <Route path="/operators" element={<Operators />} />
+              <Route path="/operators/:slug" element={<OperatorDetail />} />
+              <Route path="/operators/:operatorSlug/parks" element={<OperatorParks />} />
+              <Route path="/auth" element={<Auth />} />
+              <Route path="/auth/callback" element={<AuthCallback />} />
+              <Route path="/auth/mfa-step-up" element={<MFAStepUp />} />
+              <Route path="/profile" element={<Profile />} />
+              <Route path="/profile/:username" element={<Profile />} />
+              <Route path="/settings" element={<UserSettings />} />
+              <Route path="/admin" element={<AdminDashboard />} />
+              <Route path="/admin/moderation" element={<AdminModeration />} />
+              <Route path="/admin/reports" element={<AdminReports />} />
+              <Route path="/admin/system-log" element={<AdminSystemLog />} />
+              <Route path="/admin/users" element={<AdminUsers />} />
+              <Route path="/admin/blog" element={<AdminBlog />} />
+              <Route path="/admin/settings" element={<AdminSettings />} />
+              <Route path="/terms" element={<Terms />} />
+              <Route path="/privacy" element={<Privacy />} />
+              <Route path="/submission-guidelines" element={<SubmissionGuidelines />} />
+              <Route path="/force-logout" element={<ForceLogout />} />
+              {/* ADD ALL CUSTOM ROUTES ABOVE THE CATCH-ALL "*" ROUTE */}
+              <Route path="*" element={<NotFound />} />
+            </Routes>
           </div>
-        </BrowserRouter>
-      </TooltipProvider>
+          <Footer />
+        </div>
+      </BrowserRouter>
+    </TooltipProvider>
   );
 }
 
 const App = () => (
   <QueryClientProvider client={queryClient}>
     <AuthProvider>
-      <AuthModalProvider>
-        <AppContent />
-      </AuthModalProvider>
+      <AppContent />
     </AuthProvider>
-    {import.meta.env.DEV && (
-      <ReactQueryDevtools 
-        initialIsOpen={false}
-        position="bottom"
-      />
-    )}
+    {import.meta.env.DEV && <ReactQueryDevtools initialIsOpen={false} position="bottom" />}
   </QueryClientProvider>
 );