diff --git a/dashboard/src/components/Header.tsx b/dashboard/src/components/Header.tsx
index 9b0f0e39..2d4ed284 100644
--- a/dashboard/src/components/Header.tsx
+++ b/dashboard/src/components/Header.tsx
@@ -1,16 +1,13 @@
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Separator } from "@/components/ui/separator";
-import { Button } from "@/components/ui/button";
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
-  DropdownMenuRadioGroup,
-  DropdownMenuRadioItem,
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { currentVehicle, currentUser } from "@/consts/config";
+import { currentUser } from "@/consts/config";
 import { SHA256 } from "crypto-js";
 import { useNavigate } from "react-router-dom";
 import { logout } from "@/lib/auth";
@@ -24,8 +21,6 @@ interface HeaderProps {
 const Header = (props: HeaderProps) => {
   const navigate = useNavigate();
 
-  function selectVehicle(vehicleId: string) {}
-
   return (
     <nav
       className={`fixed top-0 z-20 w-full items-center justify-start transition-all duration-200 ${props.scroll > 24 ? "bg-card shadow-lg" : "bg-background"} ${props.className}`}
diff --git a/dashboard/src/consts/config.tsx b/dashboard/src/consts/config.tsx
index ff7a5dcd..217ffecc 100644
--- a/dashboard/src/consts/config.tsx
+++ b/dashboard/src/consts/config.tsx
@@ -1,21 +1,5 @@
 import { Vehicle, initVehicle } from "@/models/car";
 import { User, initUser } from "@/models/user";
-import AccelerometerLiveWidget from "@/pages/gr24/mobile/widgets/AccelerometerLiveWidget";
-import GraphLiveWidget from "@/pages/gr24/mobile/widgets/AltitudeGraphLiveWidget";
-import DebugLiveWidget from "@/pages/gr24/mobile/widgets/DebugLiveWidget";
-import MapLiveWidget from "@/pages/gr24/mobile/widgets/MapLiveWidget";
-import MapSpeedLiveWidget from "@/pages/gr24/mobile/widgets/MapSpeedLiveWidget";
-import ACURawWidget from "@/pages/gr24/acu/widgets/DebugRawLiveWidget";
-import BCMRawWidget from "@/pages/gr24/bcm/widgets/DebugRawLiveWidget";
-import DashPanelRawWidget from "@/pages/gr24/dash_panel/widgets/DebugRawLiveWidget";
-import InverterRawWidget from "@/pages/gr24/inverter/widgets/DebugRawLiveWidget";
-import PedalRawWidget from "@/pages/gr24/pedal/widgets/DebugRawLiveWidget";
-import MobileRawWidget from "@/pages/gr24/mobile/widgets/DebugRawLiveWidget";
-import VDMRawWidget from "@/pages/gr24/vdm/widgets/DebugRawLiveWidget";
-import WheelRawWidget from "@/pages/gr24/wheel/widgets/DebugRawLiveWidget";
-import PedalLiveWidget from "@/pages/gr24/pedal/widgets/PedalLiveWidget";
-import SegmentLiveWidget from "@/pages/gr24/acu/widgets/SegmentLiveWidget";
-import CellLiveWidget from "@/pages/gr24/acu/widgets/CellLiveWidget";
 
 export const currentUser: User = initUser;
 export const currentVehicle: Vehicle = initVehicle;
@@ -25,154 +9,5 @@ export const MAPACHE_API_URL =
   "http://hamilton-ec2.gauchoracing.com:10310";
 
 export const MAPACHE_WS_URL =
-  import.meta.env.VITE_MAPACHE_WS_URL ?? "ws://hamilton-ec2.gauchoracing.com:10310";
-
-export const acuLiveWidgets = [
-  {
-    name: "Segments Live",
-    width: 1200,
-    height: 300,
-    component: <SegmentLiveWidget />,
-  },
-  {
-    name: "Cells Live",
-    width: 1200,
-    height: 600,
-    component: <CellLiveWidget />,
-  },
-  {
-    name: "Raw Debug Live",
-    width: 600,
-    height: 300,
-    component: <ACURawWidget />,
-  },
-];
-
-export const bcmLiveWidgets = [
-  {
-    name: "Raw Debug Live",
-    width: 600,
-    height: 300,
-    component: <BCMRawWidget />,
-  },
-];
-
-export const dashPanelLiveWidgets = [
-  {
-    name: "Raw Debug Live",
-    width: 600,
-    height: 300,
-    component: <DashPanelRawWidget />,
-  },
-];
-
-export const inverterLiveWidgets = [
-  {
-    name: "Raw Debug Live",
-    width: 600,
-    height: 300,
-    component: <PedalRawWidget />,
-  },
-];
-
-export const mobileLiveWidgets = [
-  {
-    name: "Map",
-    width: 600,
-    height: 300,
-    component: <MapLiveWidget />,
-  },
-  {
-    name: "Map w/ Speed",
-    width: 600,
-    height: 300,
-    component: <MapSpeedLiveWidget />,
-  },
-  {
-    name: "Map w/ Speed Large",
-    width: 932,
-    height: 300,
-    component: <MapSpeedLiveWidget />,
-  },
-  {
-    name: "Accelerometer Plot",
-    width: 300,
-    height: 300,
-    component: <AccelerometerLiveWidget />,
-  },
-  {
-    name: "Altitude Graph",
-    width: 600,
-    height: 300,
-    component: <GraphLiveWidget field="altitude" />,
-  },
-  {
-    name: "Heading Graph",
-    width: 600,
-    height: 300,
-    component: <GraphLiveWidget field="heading" />,
-  },
-  {
-    name: "Accelerometer X Graph",
-    width: 600,
-    height: 300,
-    component: <GraphLiveWidget field="accelerometer_x" />,
-  },
-  {
-    name: "Accelerometer Y Graph",
-    width: 600,
-    height: 300,
-    component: <GraphLiveWidget field="accelerometer_y" />,
-  },
-  {
-    name: "Accelerometer Z Graph",
-    width: 600,
-    height: 300,
-    component: <GraphLiveWidget field="accelerometer_z" />,
-  },
-  {
-    name: "Debug Live",
-    width: 600,
-    height: 300,
-    component: <DebugLiveWidget />,
-  },
-  {
-    name: "Raw Debug Live",
-    width: 600,
-    height: 300,
-    component: <MobileRawWidget />,
-  },
-];
-
-export const pedalLiveWidgets = [
-  {
-    name: "Pedal Live",
-    width: 300,
-    height: 300,
-    component: <PedalLiveWidget />,
-  },
-  {
-    name: "Raw Debug Live",
-    width: 600,
-    height: 300,
-    component: <PedalRawWidget />,
-  },
-];
-
-export const vdmLiveWidgets = [
-  {
-    name: "Raw Debug Live",
-    width: 600,
-    height: 300,
-    component: <VDMRawWidget />,
-  },
-];
-
-export const wheelLiveWidgets = [
-  {
-    name: "Raw Debug Live",
-    width: 600,
-    height: 300,
-    component: <WheelRawWidget />,
-  },
-];
+  import.meta.env.VITE_MAPACHE_WS_URL ??
+  "ws://hamilton-ec2.gauchoracing.com:10310";
diff --git a/dashboard/src/main.tsx b/dashboard/src/main.tsx
index 3a8b6b47..92f7e94a 100644
--- a/dashboard/src/main.tsx
+++ b/dashboard/src/main.tsx
@@ -6,19 +6,8 @@ import "/node_modules/react-grid-layout/css/styles.css";
 import "/node_modules/react-resizable/css/styles.css";
 import "mapbox-gl/dist/mapbox-gl.css";
 import { Toaster } from "./components/ui/sonner.tsx";
-import PedalPage from "./pages/gr24/pedal/PedalPage.tsx";
 import RegisterPage from "./pages/auth/RegisterPage.tsx";
-import DashboardPage from "./pages/gr24/dashboard/DashboardPage.tsx";
-import NodesPage from "./pages/gr24/nodes/NodesPage.tsx";
-import MobilePage from "./pages/gr24/mobile/MobilePage.tsx";
 import App from "./App.tsx";
-import VDMPage from "./pages/gr24/vdm/VDMPage.tsx";
-import WheelPage from "./pages/gr24/wheel/WheelPage.tsx";
-import InverterPage from "./pages/gr24/inverter/InverterPage.tsx";
-import SteeringWheelPage from "./pages/gr24/steering_wheel/SteeringWheelPage.tsx";
-import ACUPage from "./pages/gr24/acu/ACUPage.tsx";
-import BCMPage from "./pages/gr24/bcm/BCMPage.tsx";
-import DashPanelPage from "./pages/gr24/dash_panel/DashPanelPage.tsx";
 
 const router = createBrowserRouter([
   {
@@ -29,50 +18,6 @@ const router = createBrowserRouter([
     path: "/auth/register",
     element: <RegisterPage />,
   },
-  {
-    path: "/dash",
-    element: <DashboardPage />,
-  },
-  {
-    path: "/gr24/dash",
-    element: <DashboardPage />,
-  },
-  {
-    path: "/gr24/nodes",
-    element: <NodesPage />,
-  },
-  {
-    path: "/gr24/acu",
-    element: <ACUPage />,
-  },
-  {
-    path: "/gr24/bcm",
-    element: <BCMPage />,
-  },
-  {
-    path: "/gr24/dpanel",
-    element: <DashPanelPage />,
-  },
-  {
-    path: "/gr24/inverter",
-    element: <InverterPage />,
-  },
-  {
-    path: "/gr24/mobile",
-    element: <MobilePage />,
-  },
-  {
-    path: "/gr24/pedal",
-    element: <PedalPage />,
-  },
-  {
-    path: "/gr24/vdm",
-    element: <VDMPage />,
-  },
-  {
-    path: "/gr24/wheel",
-    element: <WheelPage />,
-  },
 ]);
 
 ReactDOM.createRoot(document.getElementById("root")!).render(
diff --git a/dashboard/src/models/gr24/acu.tsx b/dashboard/src/models/gr24/acu.tsx
deleted file mode 100644
index c2f20011..00000000
--- a/dashboard/src/models/gr24/acu.tsx
+++ /dev/null
@@ -1,503 +0,0 @@
-export interface ACU {
-  id: string;
-  vehicle_id: string;
-  created_at: Date;
-
-  accumulator_voltage: number;
-  accumulator_current: number;
-  max_cell_temp: number;
-
-  // Errors
-  errors: number;
-  over_temp_error: boolean;
-  over_voltage_error: boolean;
-  over_current_error: boolean;
-  bms_error: boolean;
-  under_voltage_error: boolean;
-  precharge_error: boolean;
-  teensy_error: boolean;
-  under_temp_error: boolean;
-
-  // Warnings
-  warnings: number;
-  open_wire_warning: boolean;
-  adc_warning: boolean;
-  cell_warning: boolean;
-  high_current_warning: boolean;
-  low_charge_state_warning: boolean;
-  cell_imbalance_warning: boolean;
-  humidity_warning: boolean;
-  hydrogen_warning: boolean;
-
-  ts_voltage: number;
-
-  // States
-  states: number;
-  is_air_positive: boolean;
-  is_air_negative: boolean;
-  is_precharging: boolean;
-  is_precharge_done: boolean;
-  is_shutdown: boolean;
-
-  max_bal_resistor_temp: number;
-  sdc_voltage: number;
-  glv_voltage: number;
-  state_of_charge: number;
-  fan1_speed: number;
-  fan2_speed: number;
-  fan3_speed: number;
-  pump_speed: number;
-  acu_temp1: number;
-  acu_temp2: number;
-  acu_temp3: number;
-
-  // CoolingErrors
-  cooling_errors: number;
-  water_overtemp_error: boolean;
-  fan1_error: boolean;
-  fan2_error: boolean;
-  fan3_error: boolean;
-  fan4_error: boolean;
-  pump_error: boolean;
-
-  // Cell Voltages
-  cell0_voltage: number;
-  cell1_voltage: number;
-  cell2_voltage: number;
-  cell3_voltage: number;
-  cell4_voltage: number;
-  cell5_voltage: number;
-  cell6_voltage: number;
-  cell7_voltage: number;
-  cell8_voltage: number;
-  cell9_voltage: number;
-  cell10_voltage: number;
-  cell11_voltage: number;
-  cell12_voltage: number;
-  cell13_voltage: number;
-  cell14_voltage: number;
-  cell15_voltage: number;
-  cell16_voltage: number;
-  cell17_voltage: number;
-  cell18_voltage: number;
-  cell19_voltage: number;
-  cell20_voltage: number;
-  cell21_voltage: number;
-  cell22_voltage: number;
-  cell23_voltage: number;
-  cell24_voltage: number;
-  cell25_voltage: number;
-  cell26_voltage: number;
-  cell27_voltage: number;
-  cell28_voltage: number;
-  cell29_voltage: number;
-  cell30_voltage: number;
-  cell31_voltage: number;
-  cell32_voltage: number;
-  cell33_voltage: number;
-  cell34_voltage: number;
-  cell35_voltage: number;
-  cell36_voltage: number;
-  cell37_voltage: number;
-  cell38_voltage: number;
-  cell39_voltage: number;
-  cell40_voltage: number;
-  cell41_voltage: number;
-  cell42_voltage: number;
-  cell43_voltage: number;
-  cell44_voltage: number;
-  cell45_voltage: number;
-  cell46_voltage: number;
-  cell47_voltage: number;
-  cell48_voltage: number;
-  cell49_voltage: number;
-  cell50_voltage: number;
-  cell51_voltage: number;
-  cell52_voltage: number;
-  cell53_voltage: number;
-  cell54_voltage: number;
-  cell55_voltage: number;
-  cell56_voltage: number;
-  cell57_voltage: number;
-  cell58_voltage: number;
-  cell59_voltage: number;
-  cell60_voltage: number;
-  cell61_voltage: number;
-  cell62_voltage: number;
-  cell63_voltage: number;
-  cell64_voltage: number;
-  cell65_voltage: number;
-  cell66_voltage: number;
-  cell67_voltage: number;
-  cell68_voltage: number;
-  cell69_voltage: number;
-  cell70_voltage: number;
-  cell71_voltage: number;
-  cell72_voltage: number;
-  cell73_voltage: number;
-  cell74_voltage: number;
-  cell75_voltage: number;
-  cell76_voltage: number;
-  cell77_voltage: number;
-  cell78_voltage: number;
-  cell79_voltage: number;
-  cell80_voltage: number;
-  cell81_voltage: number;
-  cell82_voltage: number;
-  cell83_voltage: number;
-  cell84_voltage: number;
-  cell85_voltage: number;
-  cell86_voltage: number;
-  cell87_voltage: number;
-  cell88_voltage: number;
-  cell89_voltage: number;
-  cell90_voltage: number;
-  cell91_voltage: number;
-  cell92_voltage: number;
-  cell93_voltage: number;
-  cell94_voltage: number;
-  cell95_voltage: number;
-  cell96_voltage: number;
-  cell97_voltage: number;
-  cell98_voltage: number;
-  cell99_voltage: number;
-  cell100_voltage: number;
-  cell101_voltage: number;
-  cell102_voltage: number;
-  cell103_voltage: number;
-  cell104_voltage: number;
-  cell105_voltage: number;
-  cell106_voltage: number;
-  cell107_voltage: number;
-  cell108_voltage: number;
-  cell109_voltage: number;
-  cell110_voltage: number;
-  cell111_voltage: number;
-  cell112_voltage: number;
-  cell113_voltage: number;
-  cell114_voltage: number;
-  cell115_voltage: number;
-  cell116_voltage: number;
-  cell117_voltage: number;
-  cell118_voltage: number;
-  cell119_voltage: number;
-  cell120_voltage: number;
-  cell121_voltage: number;
-  cell122_voltage: number;
-  cell123_voltage: number;
-  cell124_voltage: number;
-  cell125_voltage: number;
-  cell126_voltage: number;
-  cell127_voltage: number;
-
-  // Cell Temps
-  cell0_temp: number;
-  cell1_temp: number;
-  cell2_temp: number;
-  cell3_temp: number;
-  cell4_temp: number;
-  cell5_temp: number;
-  cell6_temp: number;
-  cell7_temp: number;
-  cell8_temp: number;
-  cell9_temp: number;
-  cell10_temp: number;
-  cell11_temp: number;
-  cell12_temp: number;
-  cell13_temp: number;
-  cell14_temp: number;
-  cell15_temp: number;
-  cell16_temp: number;
-  cell17_temp: number;
-  cell18_temp: number;
-  cell19_temp: number;
-  cell20_temp: number;
-  cell21_temp: number;
-  cell22_temp: number;
-  cell23_temp: number;
-  cell24_temp: number;
-  cell25_temp: number;
-  cell26_temp: number;
-  cell27_temp: number;
-  cell28_temp: number;
-  cell29_temp: number;
-  cell30_temp: number;
-  cell31_temp: number;
-  cell32_temp: number;
-  cell33_temp: number;
-  cell34_temp: number;
-  cell35_temp: number;
-  cell36_temp: number;
-  cell37_temp: number;
-  cell38_temp: number;
-  cell39_temp: number;
-  cell40_temp: number;
-  cell41_temp: number;
-  cell42_temp: number;
-  cell43_temp: number;
-  cell44_temp: number;
-  cell45_temp: number;
-  cell46_temp: number;
-  cell47_temp: number;
-  cell48_temp: number;
-  cell49_temp: number;
-  cell50_temp: number;
-  cell51_temp: number;
-  cell52_temp: number;
-  cell53_temp: number;
-  cell54_temp: number;
-  cell55_temp: number;
-  cell56_temp: number;
-  cell57_temp: number;
-  cell58_temp: number;
-  cell59_temp: number;
-  cell60_temp: number;
-  cell61_temp: number;
-  cell62_temp: number;
-  cell63_temp: number;
-  cell64_temp: number;
-  cell65_temp: number;
-  cell66_temp: number;
-  cell67_temp: number;
-  cell68_temp: number;
-  cell69_temp: number;
-  cell70_temp: number;
-  cell71_temp: number;
-  cell72_temp: number;
-  cell73_temp: number;
-  cell74_temp: number;
-  cell75_temp: number;
-  cell76_temp: number;
-  cell77_temp: number;
-  cell78_temp: number;
-  cell79_temp: number;
-  cell80_temp: number;
-  cell81_temp: number;
-  cell82_temp: number;
-  cell83_temp: number;
-  cell84_temp: number;
-  cell85_temp: number;
-  cell86_temp: number;
-  cell87_temp: number;
-  cell88_temp: number;
-  cell89_temp: number;
-  cell90_temp: number;
-  cell91_temp: number;
-  cell92_temp: number;
-  cell93_temp: number;
-  cell94_temp: number;
-  cell95_temp: number;
-  cell96_temp: number;
-  cell97_temp: number;
-  cell98_temp: number;
-  cell99_temp: number;
-  cell100_temp: number;
-  cell101_temp: number;
-  cell102_temp: number;
-  cell103_temp: number;
-  cell104_temp: number;
-  cell105_temp: number;
-  cell106_temp: number;
-  cell107_temp: number;
-  cell108_temp: number;
-  cell109_temp: number;
-  cell110_temp: number;
-  cell111_temp: number;
-  cell112_temp: number;
-  cell113_temp: number;
-  cell114_temp: number;
-  cell115_temp: number;
-  cell116_temp: number;
-  cell117_temp: number;
-  cell118_temp: number;
-  cell119_temp: number;
-  cell120_temp: number;
-  cell121_temp: number;
-  cell122_temp: number;
-  cell123_temp: number;
-  cell124_temp: number;
-  cell125_temp: number;
-  cell126_temp: number;
-  cell127_temp: number;
-}
-
-export const getSegments = (acu: ACU) => {
-  let segment0VoltageSum = 0;
-  let segment1VoltageSum = 0;
-  let segment2VoltageSum = 0;
-  let segment3VoltageSum = 0;
-  let segment4VoltageSum = 0;
-  let segment5VoltageSum = 0;
-  let segment6VoltageSum = 0;
-  let segment7VoltageSum = 0;
-
-  let segment0TempSum = 0;
-  let segment1TempSum = 0;
-  let segment2TempSum = 0;
-  let segment3TempSum = 0;
-  let segment4TempSum = 0;
-  let segment5TempSum = 0;
-  let segment6TempSum = 0;
-  let segment7TempSum = 0;
-
-  for (let i = 0; i < 128; i++) {
-    const voltageField = acu[`cell${i}_voltage`];
-    const voltageAdd = typeof voltageField === "number" ? voltageField : 0;
-    if (i < 16) {
-      segment0VoltageSum += voltageAdd;
-    } else if (i < 32) {
-      segment1VoltageSum += voltageAdd;
-    } else if (i < 48) {
-      segment2VoltageSum += voltageAdd;
-    } else if (i < 64) {
-      segment3VoltageSum += voltageAdd;
-    } else if (i < 80) {
-      segment4VoltageSum += voltageAdd;
-    } else if (i < 96) {
-      segment5VoltageSum += voltageAdd;
-    } else if (i < 112) {
-      segment6VoltageSum += voltageAdd;
-    } else {
-      segment7VoltageSum += voltageAdd;
-    }
-
-    const tempField = acu[`cell${i}_temp`];
-    const tempAdd = typeof tempField === "number" ? tempField : 0;
-    if (i < 16) {
-      segment0TempSum += tempAdd;
-    } else if (i < 32) {
-      segment1TempSum += tempAdd;
-    } else if (i < 48) {
-      segment2TempSum += tempAdd;
-    } else if (i < 64) {
-      segment3TempSum += tempAdd;
-    } else if (i < 80) {
-      segment4TempSum += tempAdd;
-    } else if (i < 96) {
-      segment5TempSum += tempAdd;
-    } else if (i < 112) {
-      segment6TempSum += tempAdd;
-    } else {
-      segment7TempSum += tempAdd;
-    }
-  }
-
-  return {
-    segment0_voltage: segment0VoltageSum / 16,
-    segment1_voltage: segment1VoltageSum / 16,
-    segment2_voltage: segment2VoltageSum / 16,
-    segment3_voltage: segment3VoltageSum / 16,
-    segment4_voltage: segment4VoltageSum / 16,
-    segment5_voltage: segment5VoltageSum / 16,
-    segment6_voltage: segment6VoltageSum / 16,
-    segment7_voltage: segment7VoltageSum / 16,
-    segment0_voltage_sum: segment0VoltageSum,
-    segment1_voltage_sum: segment1VoltageSum,
-    segment2_voltage_sum: segment2VoltageSum,
-    segment3_voltage_sum: segment3VoltageSum,
-    segment4_voltage_sum: segment4VoltageSum,
-    segment5_voltage_sum: segment5VoltageSum,
-    segment6_voltage_sum: segment6VoltageSum,
-    segment7_voltage_sum: segment7VoltageSum,
-    segment0_temp: segment0TempSum / 16,
-    segment1_temp: segment1TempSum / 16,
-    segment2_temp: segment2TempSum / 16,
-    segment3_temp: segment3TempSum / 16,
-    segment4_temp: segment4TempSum / 16,
-    segment5_temp: segment5TempSum / 16,
-    segment6_temp: segment6TempSum / 16,
-    segment7_temp: segment7TempSum / 16,
-  };
-};
-
-const setDefaultVoltages = (acu: ACU) => {
-  for (let i = 0; i < 128; i++) {
-    acu[`cell${i}_voltage`] = 0;
-  }
-};
-
-const setDefaultTemps = (acu: ACU) => {
-  for (let i = 0; i < 128; i++) {
-    acu[`cell${i}_temp`] = 0;
-  }
-};
-
-export const setRandomVoltages = (acu: ACU) => {
-  for (let i = 0; i < 128; i++) {
-    acu[`cell${i}_voltage`] = Math.random() * 4.2;
-  }
-};
-
-export const setRandomTemps = (acu: ACU) => {
-  for (let i = 0; i < 128; i++) {
-    acu[`cell${i}_temp`] = Math.random() * 65;
-  }
-};
-
-export const initACU = () => {
-  let init = {
-    id: "",
-    vehicle_id: "",
-    created_at: new Date(),
-
-    accumulator_voltage: 0,
-    accumulator_current: 0,
-    max_cell_temp: 0,
-
-    // Errors
-    errors: 0,
-    over_temp_error: false,
-    over_voltage_error: false,
-    over_current_error: false,
-    bms_error: false,
-    under_voltage_error: false,
-    precharge_error: false,
-    teensy_error: false,
-    under_temp_error: false,
-
-    // Warnings
-    warnings: 0,
-    open_wire_warning: false,
-    adc_warning: false,
-    cell_warning: false,
-    high_current_warning: false,
-    low_charge_state_warning: false,
-    cell_imbalance_warning: false,
-    humidity_warning: false,
-    hydrogen_warning: false,
-
-    ts_voltage: 0,
-
-    // States
-    states: 0,
-    is_air_positive: false,
-    is_air_negative: false,
-    is_precharging: false,
-    is_precharge_done: false,
-    is_shutdown: false,
-
-    max_bal_resistor_temp: 0,
-    sdc_voltage: 0,
-    glv_voltage: 0,
-    state_of_charge: 0,
-    fan1_speed: 0,
-    fan2_speed: 0,
-    fan3_speed: 0,
-    pump_speed: 0,
-    acu_temp1: 0,
-    acu_temp2: 0,
-    acu_temp3: 0,
-
-    // CoolingErrors
-    cooling_errors: 0,
-    water_overtemp_error: false,
-    fan1_error: false,
-    fan2_error: false,
-    fan3_error: false,
-    fan4_error: false,
-    pump_error: false,
-  };
-  setDefaultVoltages(init);
-  setDefaultTemps(init);
-  return init;
-};
diff --git a/dashboard/src/models/gr24/mobile.tsx b/dashboard/src/models/gr24/mobile.tsx
deleted file mode 100644
index 6c118c72..00000000
--- a/dashboard/src/models/gr24/mobile.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-export interface Mobile {
-  id: string;
-  vehicle_id: string;
-  created_at: Date;
-  latitude: number;
-  longitude: number;
-  altitude: number;
-  speed: number;
-  heading: number;
-  accelerometer_x: number;
-  accelerometer_y: number;
-  accelerometer_z: number;
-  gyroscope_x: number;
-  gyroscope_y: number;
-  gyroscope_z: number;
-  magnetometer_x: number;
-  magnetometer_y: number;
-  magnetometer_z: number;
-  battery: number;
-  millis: number;
-}
-
-export const initMobile = {
-  id: "",
-  vehicle_id: "",
-  created_at: new Date(),
-  latitude: 0,
-  longitude: 0,
-  altitude: 0,
-  speed: 0,
-  heading: 0,
-  accelerometer_x: 0,
-  accelerometer_y: 0,
-  accelerometer_z: 0,
-  gyroscope_x: 0,
-  gyroscope_y: 0,
-  gyroscope_z: 0,
-  magnetometer_x: 0,
-  magnetometer_y: 0,
-  magnetometer_z: 0,
-  battery: 0,
-  millis: 0,
-};
diff --git a/dashboard/src/pages/gr24/acu/ACUPage.tsx b/dashboard/src/pages/gr24/acu/ACUPage.tsx
deleted file mode 100644
index 6a48ff41..00000000
--- a/dashboard/src/pages/gr24/acu/ACUPage.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import Layout from "@/components/Layout";
-import { useEffect, useState } from "react";
-import { Card } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import {
-  acuLiveWidgets,
-  bcmLiveWidgets,
-  vdmLiveWidgets,
-  wheelLiveWidgets,
-} from "@/consts/config";
-import DebugRawLiveWidget from "./widgets/DebugRawLiveWidget";
-import SegmentLiveWidget from "./widgets/SegmentLiveWidget";
-import CellLiveWidget from "./widgets/CellLiveWidget";
-
-function ACUPage() {
-  const [selectingWidgets, setSelectingWidgets] = useState(false);
-  const [widgets, setWidgets] = useState([
-    {
-      name: "Segments Live",
-      width: 1200,
-      height: 300,
-      component: <SegmentLiveWidget />,
-    },
-    {
-      name: "Cells Live",
-      width: 1200,
-      height: 600,
-      component: <CellLiveWidget />,
-    },
-    {
-      name: "Raw Debug Live",
-      width: 600,
-      height: 900,
-      component: <DebugRawLiveWidget />,
-    },
-  ]);
-
-  useEffect(() => {});
-
-  function addToWidgets(widget) {
-    if (!widgets.some((item) => item.name === widget.name)) {
-      setWidgets((prevWidgets) => [...prevWidgets, widget]);
-    }
-  }
-
-  function removeFromWidgets(widget) {
-    setWidgets((prevWidgets) =>
-      prevWidgets.filter((item) => item.name !== widget.name),
-    );
-  }
-
-  const SelectWidgetsComponent = () => {
-    return (
-      <div className="p-4">
-        <Card className="p-4">
-          <h3>Select Widgets</h3>
-          {acuLiveWidgets.map((widget) => (
-            <div
-              key={widget.name}
-              className="my-2 flex items-center justify-between"
-            >
-              <p>{widget.name}</p>
-              {widgets.some((item) => item.name === widget.name) ? (
-                <Button
-                  variant="destructive"
-                  onClick={() => {
-                    removeFromWidgets(widget);
-                  }}
-                >
-                  Remove
-                </Button>
-              ) : (
-                <Button
-                  onClick={() => {
-                    addToWidgets(widget);
-                  }}
-                >
-                  Add
-                </Button>
-              )}
-            </div>
-          ))}
-        </Card>
-      </div>
-    );
-  };
-
-  return (
-    <>
-      <Layout activeTab="acu">
-        <div className="flex flex-row items-end justify-between">
-          <div>
-            <h1>ACU</h1>
-            <p className="mt-2 text-neutral-400">acu page</p>
-          </div>
-          <Button
-            onClick={() => {
-              setSelectingWidgets(!selectingWidgets);
-            }}
-            variant={selectingWidgets ? "secondary" : "outline"}
-          >
-            {selectingWidgets ? "Save" : "Select Widgets"}
-          </Button>
-        </div>
-        {selectingWidgets ? (
-          <SelectWidgetsComponent />
-        ) : (
-          <div className="flex flex-wrap">
-            {widgets.map((widget) => (
-              <Card
-                key={widget.id}
-                style={{ width: widget.width, height: widget.height }}
-                className="my-3 mr-6 overflow-auto"
-              >
-                {widget.component}
-              </Card>
-            ))}
-          </div>
-        )}
-      </Layout>
-    </>
-  );
-}
-
-export default ACUPage;
diff --git a/dashboard/src/pages/gr24/acu/widgets/CellLiveWidget.tsx b/dashboard/src/pages/gr24/acu/widgets/CellLiveWidget.tsx
deleted file mode 100644
index b1c0abc6..00000000
--- a/dashboard/src/pages/gr24/acu/widgets/CellLiveWidget.tsx
+++ /dev/null
@@ -1,187 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useEffect, useMemo, useRef, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { Mobile, initMobile } from "@/models/gr24/mobile";
-import { MAPACHE_WS_URL } from "@/consts/config";
-import {
-  ACU,
-  getSegments,
-  initACU,
-  setRandomTemps,
-  setRandomVoltages,
-} from "@/models/gr24/acu";
-import ReactFlow, { Handle, Position } from "reactflow";
-
-function CellLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/acu`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [messageJson, setMessageJson] = useState<ACU>(initACU);
-
-  const messageJsonRef = useRef(messageJson);
-
-  const [nodes, setNodes] = useState<any[]>([]);
-  const [edges, setEdges] = useState<any[]>([]);
-
-  const maxVoltage = 4.2;
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      setMessageJson(data);
-    }
-  }, [lastMessage]);
-
-  useEffect(() => {
-    messageJsonRef.current = messageJson;
-  }, [messageJson]);
-
-  useEffect(() => {
-    const interval = setInterval(() => {
-      createSegments(messageJsonRef.current); // Always gets current value
-    }, 1000);
-
-    return () => clearInterval(interval);
-  }, []); // Empty dependency array is fine now
-
-  const nodeTypes = useMemo(() => {
-    return {
-      cell: ({ data }: { data: any }) => {
-        return (
-          <div
-            className="border-primary-500 flex items-center justify-center rounded-md border text-xl font-bold text-white"
-            style={{
-              width: 100,
-              height: 100,
-              position: "relative",
-              overflow: "hidden",
-            }}
-          >
-            <div
-              className={`absolute ${getVoltageBackgroundColor(data.voltage)} bottom-0 opacity-25`}
-              style={{
-                width: 125,
-                height: `${(data.voltage / maxVoltage) * 100}%`,
-                transition: "height 0.3s ease",
-                zIndex: 0,
-              }}
-            />
-            <div
-              className="text-center"
-              style={{ position: "relative", zIndex: 1 }}
-            >
-              <h4>{data.label}</h4>
-              <div>{`${data.voltage} V`}</div>
-              <div className={`${getTempColor(data.temp)}`}>
-                {`${data.temp} °C`}
-              </div>
-            </div>
-          </div>
-        );
-      },
-    };
-  }, []);
-
-  const getVoltageBackgroundColor = (voltage) => {
-    const fraction = voltage / maxVoltage;
-    if (fraction < 0.2) {
-      return "bg-red-400";
-    } else if (fraction < 0.4) {
-      return "bg-yellow-400";
-    } else {
-      return "bg-green-400";
-    }
-  };
-
-  const getTempColor = (temp: number) => {
-    if (temp < 45) {
-      return "text-green-400";
-    } else if (temp < 60) {
-      return "text-yellow-400";
-    } else {
-      return "text-red-400";
-    }
-  };
-
-  function createSegments(data: ACU) {
-    const cellsPerGroup = 16;
-    const columnsPerGroup = 2;
-    const cellWidth = 100;
-    const cellHeight = 100;
-    const groupWidth = columnsPerGroup * cellWidth;
-    const groupSpacing = 20;
-
-    for (let i = 0; i < 128; i++) {
-      const groupIndex = Math.floor(i / cellsPerGroup);
-      const groupOffsetX = groupIndex * (groupWidth + groupSpacing);
-      const localIndex = i % cellsPerGroup;
-      const column = localIndex % columnsPerGroup;
-      const row = Math.floor(localIndex / columnsPerGroup);
-
-      const cell = {
-        id: `cell${i}`,
-        type: "cell",
-        data: {
-          label: `Cell ${i}`,
-          voltage: data[`cell${i}_voltage`].toFixed(2),
-          temp: data[`cell${i}_temp`].toFixed(2),
-        },
-        position: {
-          x: 20 + groupOffsetX + column * cellWidth,
-          y: 20 + row * cellHeight,
-        },
-      };
-      setNodes((nodes) => [...nodes, cell]);
-    }
-  }
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div style={{ height: "100%", width: "100%" }}>
-            <ReactFlow
-              nodes={nodes}
-              edges={edges}
-              nodeTypes={nodeTypes}
-              defaultViewport={{ x: 0, y: 0, zoom: 0.675 }}
-              proOptions={{ hideAttribution: true }}
-            ></ReactFlow>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default CellLiveWidget;
diff --git a/dashboard/src/pages/gr24/acu/widgets/DebugRawLiveWidget.tsx b/dashboard/src/pages/gr24/acu/widgets/DebugRawLiveWidget.tsx
deleted file mode 100644
index ff6a7ce2..00000000
--- a/dashboard/src/pages/gr24/acu/widgets/DebugRawLiveWidget.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useEffect, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { Mobile, initMobile } from "@/models/gr24/mobile";
-import { MAPACHE_WS_URL } from "@/consts/config";
-
-function DebugRawLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/acu`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [messageJson, setMessageJson] = useState<Mobile>(initMobile);
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      setMessageJson(data);
-    }
-  }, [lastMessage]);
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div>
-            <div className="m-4 flex w-full flex-col">
-              {Object.entries(messageJson).map(([key, value]) => (
-                <div key={key} className="flex">
-                  <div className="pr-2 font-semibold">{key}:</div>
-                  <div className="font-semibold text-gray-400">
-                    {value.toString()}
-                  </div>
-                </div>
-              ))}
-            </div>
-            <div className="mx-4 flex">
-              <div className="pr-2 font-semibold">Last Update:</div>
-              <div className="font-semibold text-gray-400">
-                {new Date(messageJson.created_at).toISOString()}
-              </div>
-            </div>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default DebugRawLiveWidget;
diff --git a/dashboard/src/pages/gr24/acu/widgets/SegmentLiveWidget.tsx b/dashboard/src/pages/gr24/acu/widgets/SegmentLiveWidget.tsx
deleted file mode 100644
index 23fbc8c4..00000000
--- a/dashboard/src/pages/gr24/acu/widgets/SegmentLiveWidget.tsx
+++ /dev/null
@@ -1,175 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useEffect, useMemo, useRef, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { Mobile, initMobile } from "@/models/gr24/mobile";
-import { MAPACHE_WS_URL } from "@/consts/config";
-import {
-  ACU,
-  getSegments,
-  initACU,
-  setRandomTemps,
-  setRandomVoltages,
-} from "@/models/gr24/acu";
-import ReactFlow, { Handle, Position } from "reactflow";
-
-function SegmentLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/acu`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [messageJson, setMessageJson] = useState<ACU>(initACU);
-
-  const messageJsonRef = useRef(messageJson);
-
-  const [nodes, setNodes] = useState<any[]>([]);
-  const [edges, setEdges] = useState<any[]>([]);
-
-  const maxVoltage = 4.2 * 16;
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      setMessageJson(data);
-    }
-  }, [lastMessage]);
-
-  useEffect(() => {
-    messageJsonRef.current = messageJson;
-  }, [messageJson]);
-
-  useEffect(() => {
-    const interval = setInterval(() => {
-      createSegments(messageJsonRef.current); // Always gets current value
-    }, 1000);
-
-    return () => clearInterval(interval);
-  }, []); // Empty dependency array is fine now
-
-  const nodeTypes = useMemo(() => {
-    return {
-      segment: ({ data }: { data: any }) => {
-        return (
-          <div
-            className="border-primary-500 flex items-center justify-center rounded-md border text-xl font-bold text-white"
-            style={{
-              width: 125,
-              height: 250,
-              position: "relative",
-              overflow: "hidden",
-            }}
-          >
-            <div
-              className={`absolute ${getVoltageBackgroundColor(data.voltage)} bottom-0 opacity-25`}
-              style={{
-                width: 125,
-                height: `${(data.voltage / maxVoltage) * 100}%`,
-                transition: "height 0.3s ease",
-                zIndex: 0,
-              }}
-            />
-            <div
-              className="text-center"
-              style={{ position: "relative", zIndex: 1 }}
-            >
-              <h4>{data.label}</h4>
-              <div>{`${data.voltage} V`}</div>
-              <div className={`${getTempColor(data.temp)}`}>
-                {`${data.temp} °C`}
-              </div>
-            </div>
-          </div>
-        );
-      },
-    };
-  }, []);
-
-  const getVoltageBackgroundColor = (voltage) => {
-    const fraction = voltage / maxVoltage;
-    if (fraction < 0.2) {
-      return "bg-red-400";
-    } else if (fraction < 0.4) {
-      return "bg-yellow-400";
-    } else {
-      return "bg-green-400";
-    }
-  };
-
-  const getTempColor = (temp: number) => {
-    if (temp < 45) {
-      return "text-green-400";
-    } else if (temp < 60) {
-      return "text-yellow-400";
-    } else {
-      return "text-red-400";
-    }
-  };
-
-  function createSegments(data: ACU) {
-    for (let i = 0; i < 8; i++) {
-      const segment = {
-        id: `segment${i}`,
-        type: "segment",
-        data: {
-          label: `Segment ${i}`,
-          voltage: (getSegments(data) as any)[`segment${i}_voltage_sum`].toFixed(
-            2,
-          ),
-          temp: (getSegments(data) as any)[`segment${i}_temp`].toFixed(2),
-        },
-        position: {
-          x: 20 * (i + 1) + i * 125,
-          y: 20,
-        },
-      };
-      setNodes((nodes) => [...nodes, segment]);
-    }
-  }
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div style={{ height: "100%", width: "100%" }}>
-            <ReactFlow
-              nodes={nodes}
-              edges={edges}
-              nodeTypes={nodeTypes}
-              proOptions={{ hideAttribution: true }}
-            ></ReactFlow>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default SegmentLiveWidget;
diff --git a/dashboard/src/pages/gr24/bcm/BCMPage.tsx b/dashboard/src/pages/gr24/bcm/BCMPage.tsx
deleted file mode 100644
index b747b807..00000000
--- a/dashboard/src/pages/gr24/bcm/BCMPage.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import Layout from "@/components/Layout";
-import { useEffect, useState } from "react";
-import { Card } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import {
-  bcmLiveWidgets,
-  vdmLiveWidgets,
-  wheelLiveWidgets,
-} from "@/consts/config";
-import DebugRawLiveWidget from "./widgets/DebugRawLiveWidget";
-
-function BCMPage() {
-  const [selectingWidgets, setSelectingWidgets] = useState(false);
-  const [widgets, setWidgets] = useState([
-    {
-      name: "Raw Debug Live",
-      width: 600,
-      height: 300,
-      component: <DebugRawLiveWidget />,
-    },
-  ]);
-
-  useEffect(() => {});
-
-  function addToWidgets(widget) {
-    if (!widgets.some((item) => item.name === widget.name)) {
-      setWidgets((prevWidgets) => [...prevWidgets, widget]);
-    }
-  }
-
-  function removeFromWidgets(widget) {
-    setWidgets((prevWidgets) =>
-      prevWidgets.filter((item) => item.name !== widget.name),
-    );
-  }
-
-  const SelectWidgetsComponent = () => {
-    return (
-      <div className="p-4">
-        <Card className="p-4">
-          <h3>Select Widgets</h3>
-          {bcmLiveWidgets.map((widget) => (
-            <div
-              key={widget.name}
-              className="my-2 flex items-center justify-between"
-            >
-              <p>{widget.name}</p>
-              {widgets.some((item) => item.name === widget.name) ? (
-                <Button
-                  variant="destructive"
-                  onClick={() => {
-                    removeFromWidgets(widget);
-                  }}
-                >
-                  Remove
-                </Button>
-              ) : (
-                <Button
-                  onClick={() => {
-                    addToWidgets(widget);
-                  }}
-                >
-                  Add
-                </Button>
-              )}
-            </div>
-          ))}
-        </Card>
-      </div>
-    );
-  };
-
-  return (
-    <>
-      <Layout activeTab="bcm">
-        <div className="flex flex-row items-end justify-between">
-          <div>
-            <h1>BCM</h1>
-            <p className="mt-2 text-neutral-400">bcm page</p>
-          </div>
-          <Button
-            onClick={() => {
-              setSelectingWidgets(!selectingWidgets);
-            }}
-            variant={selectingWidgets ? "secondary" : "outline"}
-          >
-            {selectingWidgets ? "Save" : "Select Widgets"}
-          </Button>
-        </div>
-        {selectingWidgets ? (
-          <SelectWidgetsComponent />
-        ) : (
-          <div className="flex flex-wrap">
-            {widgets.map((widget) => (
-              <Card
-                key={widget.id}
-                style={{ width: widget.width, height: widget.height }}
-                className="my-3 mr-6 overflow-auto"
-              >
-                {widget.component}
-              </Card>
-            ))}
-          </div>
-        )}
-      </Layout>
-    </>
-  );
-}
-
-export default BCMPage;
diff --git a/dashboard/src/pages/gr24/bcm/widgets/DebugRawLiveWidget.tsx b/dashboard/src/pages/gr24/bcm/widgets/DebugRawLiveWidget.tsx
deleted file mode 100644
index 05ef339e..00000000
--- a/dashboard/src/pages/gr24/bcm/widgets/DebugRawLiveWidget.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useEffect, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { Mobile, initMobile } from "@/models/gr24/mobile";
-import { MAPACHE_WS_URL } from "@/consts/config";
-
-function DebugRawLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/bcm`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [messageJson, setMessageJson] = useState<Mobile>(initMobile);
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      setMessageJson(data);
-    }
-  }, [lastMessage]);
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div>
-            <div className="m-4 flex w-full flex-col">
-              {Object.entries(messageJson).map(([key, value]) => (
-                <div key={key} className="flex">
-                  <div className="pr-2 font-semibold">{key}:</div>
-                  <div className="font-semibold text-gray-400">
-                    {value.toString()}
-                  </div>
-                </div>
-              ))}
-            </div>
-            <div className="mx-4 flex">
-              <div className="pr-2 font-semibold">Last Update:</div>
-              <div className="font-semibold text-gray-400">
-                {new Date(messageJson.created_at).toISOString()}
-              </div>
-            </div>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default DebugRawLiveWidget;
diff --git a/dashboard/src/pages/gr24/dash_panel/DashPanelPage.tsx b/dashboard/src/pages/gr24/dash_panel/DashPanelPage.tsx
deleted file mode 100644
index 74f9db71..00000000
--- a/dashboard/src/pages/gr24/dash_panel/DashPanelPage.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import Layout from "@/components/Layout";
-import { useEffect, useState } from "react";
-import { Card } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import {
-  dashPanelLiveWidgets,
-  steeringWheelLiveWidgets,
-  vdmLiveWidgets,
-  wheelLiveWidgets,
-} from "@/consts/config";
-import DebugRawLiveWidget from "./widgets/DebugRawLiveWidget";
-
-function DashPanelPage() {
-  const [selectingWidgets, setSelectingWidgets] = useState(false);
-  const [widgets, setWidgets] = useState([
-    {
-      name: "Raw Debug Live",
-      width: 600,
-      height: 300,
-      component: <DebugRawLiveWidget />,
-    },
-  ]);
-
-  useEffect(() => {});
-
-  function addToWidgets(widget) {
-    if (!widgets.some((item) => item.name === widget.name)) {
-      setWidgets((prevWidgets) => [...prevWidgets, widget]);
-    }
-  }
-
-  function removeFromWidgets(widget) {
-    setWidgets((prevWidgets) =>
-      prevWidgets.filter((item) => item.name !== widget.name),
-    );
-  }
-
-  const SelectWidgetsComponent = () => {
-    return (
-      <div className="p-4">
-        <Card className="p-4">
-          <h3>Select Widgets</h3>
-          {dashPanelLiveWidgets.map((widget) => (
-            <div
-              key={widget.name}
-              className="my-2 flex items-center justify-between"
-            >
-              <p>{widget.name}</p>
-              {widgets.some((item) => item.name === widget.name) ? (
-                <Button
-                  variant="destructive"
-                  onClick={() => {
-                    removeFromWidgets(widget);
-                  }}
-                >
-                  Remove
-                </Button>
-              ) : (
-                <Button
-                  onClick={() => {
-                    addToWidgets(widget);
-                  }}
-                >
-                  Add
-                </Button>
-              )}
-            </div>
-          ))}
-        </Card>
-      </div>
-    );
-  };
-
-  return (
-    <>
-      <Layout activeTab="dpanel">
-        <div className="flex flex-row items-end justify-between">
-          <div>
-            <h1>Dash Panel</h1>
-            <p className="mt-2 text-neutral-400">dash panel page</p>
-          </div>
-          <Button
-            onClick={() => {
-              setSelectingWidgets(!selectingWidgets);
-            }}
-            variant={selectingWidgets ? "secondary" : "outline"}
-          >
-            {selectingWidgets ? "Save" : "Select Widgets"}
-          </Button>
-        </div>
-        {selectingWidgets ? (
-          <SelectWidgetsComponent />
-        ) : (
-          <div className="flex flex-wrap">
-            {widgets.map((widget) => (
-              <Card
-                key={widget.id}
-                style={{ width: widget.width, height: widget.height }}
-                className="my-3 mr-6 overflow-auto"
-              >
-                {widget.component}
-              </Card>
-            ))}
-          </div>
-        )}
-      </Layout>
-    </>
-  );
-}
-
-export default DashPanelPage;
diff --git a/dashboard/src/pages/gr24/dash_panel/widgets/DebugRawLiveWidget.tsx b/dashboard/src/pages/gr24/dash_panel/widgets/DebugRawLiveWidget.tsx
deleted file mode 100644
index 5bc0f02e..00000000
--- a/dashboard/src/pages/gr24/dash_panel/widgets/DebugRawLiveWidget.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useEffect, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { Mobile, initMobile } from "@/models/gr24/mobile";
-import { MAPACHE_WS_URL } from "@/consts/config";
-
-function DebugRawLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/dash_panel`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [messageJson, setMessageJson] = useState<Mobile>(initMobile);
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      setMessageJson(data);
-    }
-  }, [lastMessage]);
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div>
-            <div className="m-4 flex w-full flex-col">
-              {Object.entries(messageJson).map(([key, value]) => (
-                <div key={key} className="flex">
-                  <div className="pr-2 font-semibold">{key}:</div>
-                  <div className="font-semibold text-gray-400">
-                    {value.toString()}
-                  </div>
-                </div>
-              ))}
-            </div>
-            <div className="mx-4 flex">
-              <div className="pr-2 font-semibold">Last Update:</div>
-              <div className="font-semibold text-gray-400">
-                {new Date(messageJson.created_at).toISOString()}
-              </div>
-            </div>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default DebugRawLiveWidget;
diff --git a/dashboard/src/pages/gr24/dashboard/DashboardPage.tsx b/dashboard/src/pages/gr24/dashboard/DashboardPage.tsx
deleted file mode 100644
index 90569f92..00000000
--- a/dashboard/src/pages/gr24/dashboard/DashboardPage.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Card } from "@/components/ui/card";
-import Layout from "@/components/Layout";
-import { useState } from "react";
-import React from "react";
-import GR24PedalLiveWidget from "../pedal/widgets/PedalLiveWidget";
-import {
-  AlertDialogHeader,
-  AlertDialogFooter,
-} from "@/components/ui/alert-dialog";
-import {
-  AlertDialog,
-  AlertDialogTrigger,
-  AlertDialogContent,
-  AlertDialogTitle,
-  AlertDialogDescription,
-  AlertDialogCancel,
-  AlertDialogAction,
-} from "@radix-ui/react-alert-dialog";
-
-function DashboardPage() {
-  const [widgets, setWidgets] = useState([
-    {
-      id: 1,
-      name: "Pedal Live",
-      width: 300,
-      height: 300,
-      component: <GR24PedalLiveWidget />,
-    },
-  ]);
-
-  const loadWidgets = () => {
-    setWidgets([
-      ...widgets,
-      {
-        id: 2,
-        name: "Pedal Live",
-        width: 300,
-        height: 300,
-        component: <GR24PedalLiveWidget />,
-      },
-    ]);
-  };
-
-  React.useEffect(() => {
-    loadWidgets();
-  }, []);
-
-  return (
-    <>
-      <Layout activeTab="dash">
-        <h1>Dashboard</h1>
-        <p className="mt-2 text-neutral-400">I love singlestore</p>
-        <div className="flex flex-wrap">
-          {widgets.map((widget) => (
-            <Card
-              key={widget.id}
-              style={{ width: widget.width, height: widget.height }}
-              className="my-4 mr-8"
-            >
-              {widget.component}
-            </Card>
-          ))}
-        </div>
-      </Layout>
-    </>
-  );
-}
-
-export default DashboardPage;
diff --git a/dashboard/src/pages/gr24/inverter/InverterPage.tsx b/dashboard/src/pages/gr24/inverter/InverterPage.tsx
deleted file mode 100644
index bdc3e7c1..00000000
--- a/dashboard/src/pages/gr24/inverter/InverterPage.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import Layout from "@/components/Layout";
-import { useEffect, useState } from "react";
-import { Card } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import {
-  inverterLiveWidgets,
-  vdmLiveWidgets,
-  wheelLiveWidgets,
-} from "@/consts/config";
-import DebugRawLiveWidget from "./widgets/DebugRawLiveWidget";
-
-function InverterPage() {
-  const [selectingWidgets, setSelectingWidgets] = useState(false);
-  const [widgets, setWidgets] = useState([
-    {
-      name: "Raw Debug Live",
-      width: 600,
-      height: 900,
-      component: <DebugRawLiveWidget />,
-    },
-  ]);
-
-  useEffect(() => {});
-
-  function addToWidgets(widget) {
-    if (!widgets.some((item) => item.name === widget.name)) {
-      setWidgets((prevWidgets) => [...prevWidgets, widget]);
-    }
-  }
-
-  function removeFromWidgets(widget) {
-    setWidgets((prevWidgets) =>
-      prevWidgets.filter((item) => item.name !== widget.name),
-    );
-  }
-
-  const SelectWidgetsComponent = () => {
-    return (
-      <div className="p-4">
-        <Card className="p-4">
-          <h3>Select Widgets</h3>
-          {inverterLiveWidgets.map((widget) => (
-            <div
-              key={widget.name}
-              className="my-2 flex items-center justify-between"
-            >
-              <p>{widget.name}</p>
-              {widgets.some((item) => item.name === widget.name) ? (
-                <Button
-                  variant="destructive"
-                  onClick={() => {
-                    removeFromWidgets(widget);
-                  }}
-                >
-                  Remove
-                </Button>
-              ) : (
-                <Button
-                  onClick={() => {
-                    addToWidgets(widget);
-                  }}
-                >
-                  Add
-                </Button>
-              )}
-            </div>
-          ))}
-        </Card>
-      </div>
-    );
-  };
-
-  return (
-    <>
-      <Layout activeTab="inverter">
-        <div className="flex flex-row items-end justify-between">
-          <div>
-            <h1>Inverter</h1>
-            <p className="mt-2 text-neutral-400">inverter page</p>
-          </div>
-          <Button
-            onClick={() => {
-              setSelectingWidgets(!selectingWidgets);
-            }}
-            variant={selectingWidgets ? "secondary" : "outline"}
-          >
-            {selectingWidgets ? "Save" : "Select Widgets"}
-          </Button>
-        </div>
-        {selectingWidgets ? (
-          <SelectWidgetsComponent />
-        ) : (
-          <div className="flex flex-wrap">
-            {widgets.map((widget) => (
-              <Card
-                key={widget.id}
-                style={{ width: widget.width, height: widget.height }}
-                className="my-3 mr-6 overflow-auto"
-              >
-                {widget.component}
-              </Card>
-            ))}
-          </div>
-        )}
-      </Layout>
-    </>
-  );
-}
-
-export default InverterPage;
diff --git a/dashboard/src/pages/gr24/inverter/widgets/DebugRawLiveWidget.tsx b/dashboard/src/pages/gr24/inverter/widgets/DebugRawLiveWidget.tsx
deleted file mode 100644
index 7276dbda..00000000
--- a/dashboard/src/pages/gr24/inverter/widgets/DebugRawLiveWidget.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useEffect, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { Mobile, initMobile } from "@/models/gr24/mobile";
-import { MAPACHE_WS_URL } from "@/consts/config";
-
-function DebugRawLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/inverter`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [messageJson, setMessageJson] = useState<Mobile>(initMobile);
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      setMessageJson(data);
-    }
-  }, [lastMessage]);
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div>
-            <div className="m-4 flex w-full flex-col">
-              {Object.entries(messageJson).map(([key, value]) => (
-                <div key={key} className="flex">
-                  <div className="pr-2 font-semibold">{key}:</div>
-                  <div className="font-semibold text-gray-400">
-                    {value.toString()}
-                  </div>
-                </div>
-              ))}
-            </div>
-            <div className="mx-4 flex">
-              <div className="pr-2 font-semibold">Last Update:</div>
-              <div className="font-semibold text-gray-400">
-                {new Date(messageJson.created_at).toISOString()}
-              </div>
-            </div>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default DebugRawLiveWidget;
diff --git a/dashboard/src/pages/gr24/mobile/MobilePage.tsx b/dashboard/src/pages/gr24/mobile/MobilePage.tsx
deleted file mode 100644
index 3e3cb057..00000000
--- a/dashboard/src/pages/gr24/mobile/MobilePage.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import Layout from "@/components/Layout";
-import { useEffect, useState } from "react";
-import { Card } from "@/components/ui/card";
-import MapSpeedLiveWidget from "./widgets/MapSpeedLiveWidget";
-import DebugLiveWidget from "./widgets/DebugLiveWidget";
-import AccelerometerLiveWidget from "./widgets/AccelerometerLiveWidget";
-import { Button } from "@/components/ui/button";
-import { mobileLiveWidgets } from "@/consts/config";
-import DebugRawLiveWidget from "./widgets/DebugRawLiveWidget";
-
-function MobilePage() {
-  const [selectingWidgets, setSelectingWidgets] = useState(false);
-  const [widgets, setWidgets] = useState([
-    {
-      name: "Map w/ Speed Large",
-      width: 932,
-      height: 300,
-      component: <MapSpeedLiveWidget />,
-    },
-    {
-      name: "Accelerometer Plot",
-      width: 300,
-      height: 300,
-      component: <AccelerometerLiveWidget />,
-    },
-    {
-      name: "Debug Live",
-      width: 600,
-      height: 300,
-      component: <DebugLiveWidget />,
-    },
-    {
-      name: "Raw Debug Live",
-      width: 600,
-      height: 300,
-      component: <DebugRawLiveWidget />,
-    },
-  ]);
-
-  useEffect(() => {});
-
-  function addToWidgets(widget) {
-    if (!widgets.some((item) => item.name === widget.name)) {
-      setWidgets((prevWidgets) => [...prevWidgets, widget]);
-    }
-  }
-
-  function removeFromWidgets(widget) {
-    setWidgets((prevWidgets) =>
-      prevWidgets.filter((item) => item.name !== widget.name),
-    );
-  }
-
-  const SelectWidgetsComponent = () => {
-    return (
-      <div className="p-4">
-        <Card className="p-4">
-          <h3>Select Widgets</h3>
-          {mobileLiveWidgets.map((widget) => (
-            <div
-              key={widget.name}
-              className="my-2 flex items-center justify-between"
-            >
-              <p>{widget.name}</p>
-              {widgets.some((item) => item.name === widget.name) ? (
-                <Button
-                  variant="destructive"
-                  onClick={() => {
-                    removeFromWidgets(widget);
-                  }}
-                >
-                  Remove
-                </Button>
-              ) : (
-                <Button
-                  onClick={() => {
-                    addToWidgets(widget);
-                  }}
-                >
-                  Add
-                </Button>
-              )}
-            </div>
-          ))}
-        </Card>
-      </div>
-    );
-  };
-
-  return (
-    <>
-      <Layout activeTab="mobile">
-        <div className="flex flex-row items-end justify-between">
-          <div>
-            <h1>Mobile</h1>
-            <p className="mt-2 text-neutral-400">Phone on car!</p>
-          </div>
-          <Button
-            onClick={() => {
-              setSelectingWidgets(!selectingWidgets);
-            }}
-            variant={selectingWidgets ? "secondary" : "outline"}
-          >
-            {selectingWidgets ? "Save" : "Select Widgets"}
-          </Button>
-        </div>
-        {selectingWidgets ? (
-          <SelectWidgetsComponent />
-        ) : (
-          <div className="flex flex-wrap">
-            {widgets.map((widget) => (
-              <Card
-                key={widget.id}
-                style={{ width: widget.width, height: widget.height }}
-                className="my-3 mr-6 overflow-auto"
-              >
-                {widget.component}
-              </Card>
-            ))}
-          </div>
-        )}
-      </Layout>
-    </>
-  );
-}
-
-export default MobilePage;
diff --git a/dashboard/src/pages/gr24/mobile/widgets/AccelerometerLiveWidget.tsx b/dashboard/src/pages/gr24/mobile/widgets/AccelerometerLiveWidget.tsx
deleted file mode 100644
index a12b4368..00000000
--- a/dashboard/src/pages/gr24/mobile/widgets/AccelerometerLiveWidget.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useRef, useEffect, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { Mobile, initMobile } from "@/models/gr24/mobile";
-import { MAPACHE_WS_URL } from "@/consts/config";
-
-function AccelerometerLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/mobile`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [messageJson, setMessageJson] = useState<Mobile>(initMobile);
-
-  const canvasRef = React.useRef<HTMLCanvasElement>(null);
-  const dotXRef = useRef(100);
-  const dotYRef = useRef(100);
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      setMessageJson(data);
-      const x = data.accelerometer_x / 9.80665;
-      const y = data.accelerometer_y / 9.80665;
-
-      const canvas = canvasRef.current;
-      const ctx = canvas?.getContext("2d");
-      if (!ctx) return;
-
-      const animateDot = () => {
-        const targetX = 100 + x * 40;
-        const targetY = 100 + y * 40;
-
-        dotXRef.current += (targetX - dotXRef.current) * 0.5;
-        dotYRef.current += (targetY - dotYRef.current) * 0.5;
-
-        // Clear canvas
-        ctx.clearRect(0, 0, canvas!.width, canvas!.height);
-        ctx.strokeStyle = "gray";
-
-        // Draw x-axis
-        ctx.beginPath();
-        ctx.moveTo(0, 100);
-        ctx.lineTo(200, 100);
-        ctx.stroke();
-
-        // Draw y-axis
-        ctx.beginPath();
-        ctx.moveTo(100, 0);
-        ctx.lineTo(100, 200);
-        ctx.stroke();
-
-        // Draw concentric rings around the dot
-        for (let i = 5; i <= 100; i += 20) {
-          ctx.strokeStyle = "gray";
-          ctx.beginPath();
-          ctx.arc(100, 100, i, 0, 2 * Math.PI);
-          ctx.stroke();
-        }
-
-        // Label the axis by 0.5
-        ctx.fillStyle = "white";
-        ctx.font = "10px Arial";
-        ctx.fillText("0.5", 100 + 100, 100);
-        ctx.fillText("1g", 140, 100);
-        ctx.fillText("2g", 180, 100);
-        ctx.fillText("-1g", 50, 100);
-        ctx.fillText("-2g", 10, 100);
-        ctx.fillText("1g", 95, 60);
-        ctx.fillText("2g", 95, 20);
-        ctx.fillText("-1g", 95, 145);
-        ctx.fillText("-2g", 95, 185);
-
-        // Draw dot at the calculated position
-        ctx.fillStyle = "#e105a3";
-        ctx.beginPath();
-        ctx.arc(dotXRef.current, dotYRef.current, 5, 0, 2 * Math.PI);
-        ctx.fill();
-
-        requestAnimationFrame(animateDot);
-      };
-      animateDot();
-    }
-  }, [lastMessage]);
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div className="relative flex h-full w-full flex-col">
-            <canvas ref={canvasRef} width={200} height={200} />
-            <div className="absolute" style={{ left: "12px", bottom: "12px" }}>
-              <p>X: {(messageJson.accelerometer_x / 9.80665).toFixed(4)} G</p>
-              <p>Y: {(messageJson.accelerometer_y / 9.80665).toFixed(4)} G</p>
-            </div>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default AccelerometerLiveWidget;
diff --git a/dashboard/src/pages/gr24/mobile/widgets/AltitudeGraphLiveWidget.tsx b/dashboard/src/pages/gr24/mobile/widgets/AltitudeGraphLiveWidget.tsx
deleted file mode 100644
index ed781a00..00000000
--- a/dashboard/src/pages/gr24/mobile/widgets/AltitudeGraphLiveWidget.tsx
+++ /dev/null
@@ -1,206 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useEffect, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import {
-  LineChart,
-  Line,
-  XAxis,
-  YAxis,
-  CartesianGrid,
-  Tooltip,
-  ResponsiveContainer,
-} from "recharts";
-import { Card } from "@/components/ui/card";
-import { MAPACHE_WS_URL } from "@/consts/config";
-import { Mobile } from "@/models/gr24/mobile";
-
-function GraphLiveWidget({ field }: { field: string }) {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/mobile`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [data, setData] = useState<Mobile[]>([]);
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      data.altitude = Math.round(data.altitude);
-      data.heading = Math.round(data.heading);
-      data.accelerometer_x = (data.accelerometer_x / 9.80665).toFixed(6);
-      data.accelerometer_y = (data.accelerometer_y / 9.80665).toFixed(6);
-      data.accelerometer_z = (data.accelerometer_z / 9.80665).toFixed(6);
-      setData((prevData) => [...prevData.slice(-50), data]);
-    }
-  }, [lastMessage]);
-
-  function getChartTitle() {
-    switch (field) {
-      case "latitude":
-        return "Latitude";
-      case "longitude":
-        return "Longitude";
-      case "altitude":
-        return "Altitude";
-      case "heading":
-        return "Heading";
-      case "speed":
-        return "Speed";
-      case "accelerometer_x":
-        return "Acceleration X";
-      case "accelerometer_y":
-        return "Acceleration Y";
-      case "accelerometer_z":
-        return "Acceleration Z";
-      case "gyroscope_x":
-        return "Gyroscope X";
-      case "gyroscope_y":
-        return "Gyroscope Y";
-      case "gyroscope_z":
-        return "Gyroscope Z";
-      case "magnetometer_x":
-        return "Magnetometer X";
-      case "magnetometer_y":
-        return "Magnetometer Y";
-      case "magnetometer_z":
-        return "Magnetometer Z";
-      case "battery":
-        return "Battery";
-      case "millis":
-        return "Millis";
-      default:
-        return "Invalid Field";
-    }
-  }
-
-  function getYAxisDomain() {
-    switch (field) {
-      case "heading":
-        return [0, 360];
-      case "accelerometer_x":
-        return [-3, 3];
-      case "accelerometer_y":
-        return [-3, 3];
-      case "accelerometer_z":
-        return [-3, 3];
-      case "gyroscope_x":
-        return [-1, 1];
-      case "gyroscope_y":
-        return [-1, 1];
-      case "gyroscope_z":
-        return [-1, 1];
-      case "battery":
-        return [0, 100];
-      default:
-        return ["dataMin", "dataMax"];
-    }
-  }
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  const CustomTooltip = ({
-    active,
-    payload,
-    label,
-  }: {
-    active: boolean;
-    payload: any[];
-    label: string;
-  }) => {
-    if (active && payload && payload.length) {
-      return (
-        <div className="custom-tooltip">
-          <Card className="px-4 py-2">
-            <h5 className="text-center">{new Date(label).toLocaleString()}</h5>
-            <div className="flex flex-row">
-              <p className="pr-2 font-semibold text-gr-pink">
-                {getChartTitle()}:
-              </p>
-              <p className="pr-2 font-semibold text-gr-pink">
-                {payload[0].value}
-              </p>
-            </div>
-          </Card>
-        </div>
-      );
-    }
-    return null;
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div className="mx-2 text-center">
-            <h4 className="my-2">{getChartTitle()}</h4>
-            <ResponsiveContainer width="100%" height={250}>
-              <LineChart
-                width={500}
-                height={300}
-                data={data}
-                margin={{ left: -20, right: 10 }}
-              >
-                <CartesianGrid strokeDasharray="4 3" stroke="#343434" />
-                <XAxis
-                  dataKey="created_at"
-                  stroke="white"
-                  tick={{ fill: "gray" }}
-                  tickFormatter={(timestamp) =>
-                    new Date(timestamp).toLocaleTimeString()
-                  }
-                />
-                <YAxis
-                  stroke="white"
-                  tick={{ fill: "gray" }}
-                  domain={getYAxisDomain()}
-                  allowDataOverflow={true}
-                />
-                <Tooltip
-                  content={
-                    <CustomTooltip active={false} payload={[]} label={""} />
-                  }
-                />
-                <Line
-                  type="monotone"
-                  dataKey={field}
-                  stroke="#e105a3"
-                  strokeWidth={2}
-                  animateNewValues={false}
-                />
-                {/* <Line type="monotone" dataKey="altitude" stroke="#82ca9d" /> */}
-              </LineChart>
-            </ResponsiveContainer>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default GraphLiveWidget;
diff --git a/dashboard/src/pages/gr24/mobile/widgets/DebugLiveWidget.tsx b/dashboard/src/pages/gr24/mobile/widgets/DebugLiveWidget.tsx
deleted file mode 100644
index 7d5cdc73..00000000
--- a/dashboard/src/pages/gr24/mobile/widgets/DebugLiveWidget.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useEffect, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { Mobile, initMobile } from "@/models/gr24/mobile";
-import { MAPACHE_WS_URL } from "@/consts/config";
-
-function DebugLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/mobile`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [messageJson, setMessageJson] = useState<Mobile>(initMobile);
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      setMessageJson(data);
-    }
-  }, [lastMessage]);
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div>
-            <div className="m-4 flex w-full flex-row">
-              <div className="flex-1">
-                <div className="flex">
-                  <div className="pr-2 font-semibold">Latitude:</div>
-                  <div className="font-semibold text-gray-400">
-                    {messageJson.latitude.toFixed(6)}
-                  </div>
-                </div>
-                <div className="flex">
-                  <div className="pr-2 font-semibold">Longitude:</div>
-                  <div className="font-semibold text-gray-400">
-                    {messageJson.longitude.toFixed(6)}
-                  </div>
-                </div>
-                <div className="flex">
-                  <div className="pr-2 font-semibold">Altitude:</div>
-                  <div className="font-semibold text-gray-400">
-                    {messageJson.altitude.toFixed(6)} m
-                  </div>
-                </div>
-                <div className="flex">
-                  <div className="pr-2 font-semibold">Heading:</div>
-                  <div className="font-semibold text-gray-400">
-                    {messageJson.heading.toFixed(6)} °
-                  </div>
-                </div>
-                <div className="flex">
-                  <div className="pr-2 font-semibold">Speed:</div>
-                  <div className="font-semibold text-gray-400">
-                    {messageJson.speed} m/s
-                  </div>
-                </div>
-                <div className="flex">
-                  <div className="pr-2 font-semibold">Battery:</div>
-                  <div className="font-semibold text-gray-400">
-                    {messageJson.battery}%
-                  </div>
-                </div>
-              </div>
-              <div className="flex-1">
-                <div className="flex">
-                  <div className="pr-2 font-semibold">Accelerometer:</div>
-                  <div className="font-semibold text-gray-400">
-                    <div>x: {messageJson.accelerometer_x.toFixed(8)}</div>
-                    <div>y: {messageJson.accelerometer_y.toFixed(8)}</div>
-                    <div>z: {messageJson.accelerometer_z.toFixed(8)}</div>
-                  </div>
-                </div>
-                <div className="flex">
-                  <div className="pr-2 font-semibold">Gyroscope:</div>
-                  <div className="font-semibold text-gray-400">
-                    <div>x: {messageJson.gyroscope_x.toFixed(8)}</div>
-                    <div>y: {messageJson.gyroscope_y.toFixed(8)}</div>
-                    <div>z: {messageJson.gyroscope_z.toFixed(8)}</div>
-                  </div>
-                </div>
-                <div className="flex">
-                  <div className="pr-2 font-semibold">Magnetometer:</div>
-                  <div className="font-semibold text-gray-400">
-                    <div>x: {messageJson.magnetometer_x.toFixed(8)}</div>
-                    <div>y: {messageJson.magnetometer_y.toFixed(8)}</div>
-                    <div>z: {messageJson.magnetometer_z.toFixed(8)}</div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div className="mx-4 flex">
-              <div className="pr-2 font-semibold">Last Update:</div>
-              <div className="font-semibold text-gray-400">
-                {new Date(messageJson.created_at).toISOString()}
-              </div>
-            </div>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default DebugLiveWidget;
diff --git a/dashboard/src/pages/gr24/mobile/widgets/DebugRawLiveWidget.tsx b/dashboard/src/pages/gr24/mobile/widgets/DebugRawLiveWidget.tsx
deleted file mode 100644
index 776176e7..00000000
--- a/dashboard/src/pages/gr24/mobile/widgets/DebugRawLiveWidget.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useEffect, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { Mobile, initMobile } from "@/models/gr24/mobile";
-import { MAPACHE_WS_URL } from "@/consts/config";
-
-function DebugRawLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/mobile`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [messageJson, setMessageJson] = useState<Mobile>(initMobile);
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      setMessageJson(data);
-    }
-  }, [lastMessage]);
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div>
-            <div className="m-4 flex w-full flex-col">
-              {Object.entries(messageJson).map(([key, value]) => (
-                <div key={key} className="flex">
-                  <div className="pr-2 font-semibold">{key}:</div>
-                  <div className="font-semibold text-gray-400">
-                    {value.toString()}
-                  </div>
-                </div>
-              ))}
-              <div className="flex-1">
-                <div className="flex">
-                  <div className="pr-2 font-semibold">Latitude:</div>
-                  <div className="font-semibold text-gray-400">
-                    {messageJson.latitude.toFixed(6)}
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div className="mx-4 flex">
-              <div className="pr-2 font-semibold">Last Update:</div>
-              <div className="font-semibold text-gray-400">
-                {new Date(messageJson.created_at).toISOString()}
-              </div>
-            </div>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default DebugRawLiveWidget;
diff --git a/dashboard/src/pages/gr24/mobile/widgets/MapLiveWidget.tsx b/dashboard/src/pages/gr24/mobile/widgets/MapLiveWidget.tsx
deleted file mode 100644
index 157224e7..00000000
--- a/dashboard/src/pages/gr24/mobile/widgets/MapLiveWidget.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useRef, useEffect } from "react";
-import mapboxgl from "mapbox-gl";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { MAPACHE_WS_URL } from "@/consts/config";
-
-mapboxgl.accessToken = import.meta.env.VITE_MAPBOX_TOKEN;
-
-function MapLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/mobile`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-
-  const mapContainer = useRef(null);
-  const map = useRef<mapboxgl.Map | null>(null);
-  const initialLat = 42.35;
-  const initialLong = -71.06;
-  let mapMarkers: mapboxgl.Marker[] = [];
-
-  useEffect(() => {
-    if (!mapContainer.current || map.current) return; // Ensure container is not null and map is only initialized once
-    map.current = new mapboxgl.Map({
-      container: mapContainer.current,
-      style: "mapbox://styles/mapbox/streets-v10",
-      center: [initialLat, initialLong],
-      zoom: 13,
-      attributionControl: false,
-    });
-  });
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      if (map.current) {
-        if (!map.current.isMoving()) {
-          map.current.flyTo({
-            center: [data.longitude, data.latitude],
-            animate: true,
-            zoom: 16,
-            speed: 4,
-            bearing: data.heading,
-          });
-          removeMarkers();
-          const marker = new mapboxgl.Marker(vehicleMarker())
-            .setLngLat([data.longitude, data.latitude])
-            .addTo(map.current);
-          mapMarkers.push(marker);
-        }
-      }
-    }
-  }, [lastMessage]);
-
-  const vehicleMarker = () => {
-    const el = document.createElement("div");
-    el.className = "vehicle-marker";
-    el.style.width = "40px";
-    el.style.height = "40px";
-    el.style.borderRadius = "50%";
-    el.style.backgroundImage = "url('/icons/gps-marker-light.png')";
-    el.style.backgroundSize = "cover";
-    return el;
-  };
-
-  const removeMarkers = () => {
-    mapMarkers.forEach((marker) => marker.remove());
-    console.log("Removing markers");
-    mapMarkers = [];
-  };
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div className="">
-            <div
-              className="relative flex w-full flex-col items-center"
-              style={{ height: "300px" }}
-            >
-              <div
-                ref={mapContainer}
-                className="map-container absolute left-0 top-0 w-full rounded-lg"
-                style={{ height: "300px" }}
-              />
-            </div>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default MapLiveWidget;
diff --git a/dashboard/src/pages/gr24/mobile/widgets/MapSpeedLiveWidget.tsx b/dashboard/src/pages/gr24/mobile/widgets/MapSpeedLiveWidget.tsx
deleted file mode 100644
index 5bac07e8..00000000
--- a/dashboard/src/pages/gr24/mobile/widgets/MapSpeedLiveWidget.tsx
+++ /dev/null
@@ -1,172 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useRef, useEffect, useState } from "react";
-import mapboxgl from "mapbox-gl";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { Mobile, initMobile } from "@/models/gr24/mobile";
-import { MAPACHE_WS_URL } from "@/consts/config";
-
-mapboxgl.accessToken = import.meta.env.VITE_MAPBOX_TOKEN;
-
-function MapSpeedLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/mobile`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [messageJson, setMessageJson] = useState<Mobile>(initMobile);
-
-  const mapContainer = useRef(null);
-  const map = useRef<mapboxgl.Map | null>(null);
-  const initialLat = 42.35;
-  const initialLong = -71.06;
-  let mapMarkers: mapboxgl.Marker[] = [];
-
-  useEffect(() => {
-    if (!mapContainer.current || map.current) return;
-    map.current = new mapboxgl.Map({
-      container: mapContainer.current,
-      style: "mapbox://styles/mapbox/streets-v10",
-      center: [initialLat, initialLong],
-      zoom: 13,
-      attributionControl: false,
-    });
-  });
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      setMessageJson(data);
-      if (map.current) {
-        if (!map.current.isMoving()) {
-          map.current.flyTo({
-            center: [data.longitude, data.latitude],
-            animate: true,
-            zoom: 16,
-            speed: 4,
-            bearing: data.heading,
-          });
-          removeMarkers();
-          const marker = new mapboxgl.Marker(vehicleMarker())
-            .setLngLat([data.longitude, data.latitude])
-            .addTo(map.current);
-          mapMarkers.push(marker);
-        }
-      }
-    }
-  }, [lastMessage]);
-
-  const vehicleMarker = () => {
-    const el = document.createElement("div");
-    el.className = "vehicle-marker";
-    el.style.width = "40px";
-    el.style.height = "40px";
-    el.style.borderRadius = "50%";
-    el.style.backgroundImage = "url('/icons/gps-marker-light.png')";
-    el.style.backgroundSize = "cover";
-    return el;
-  };
-
-  const removeMarkers = () => {
-    mapMarkers.forEach((marker) => marker.remove());
-    console.log("Removing markers");
-    mapMarkers = [];
-  };
-
-  const getCompassString = () => {
-    const compass = ["N", "NE", "E", "SE", "S", "SW", "W", "NW"];
-    const index = Math.round(messageJson.heading / 45) % 8;
-    return compass[index];
-  };
-
-  const CompassDisplay = () => {
-    return (
-      <div
-        className="rounded-md bg-card p-4 text-center opacity-80"
-        style={{ width: "130px" }}
-      >
-        <h4>
-          {messageJson.heading.toFixed(1)}° {getCompassString()}
-        </h4>
-      </div>
-    );
-  };
-
-  const SpeedDisplay = () => {
-    return (
-      <div className="flex items-center rounded-md bg-card p-4 text-center opacity-80">
-        <div style={{ width: "50px" }}>
-          <h1>{(messageJson.speed * 2.23694).toFixed(0)}</h1>
-          <div>MPH</div>
-        </div>
-        <div
-          className="mx-2 border-l border-gray-400"
-          style={{ height: "50px" }}
-        ></div>
-        <div style={{ width: "50px" }}>
-          <h1>{(messageJson.speed * 3.6).toFixed(0)}</h1>
-          <div>KMPH</div>
-        </div>
-      </div>
-    );
-  };
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div className="">
-            <div
-              className="relative flex w-full flex-col items-center"
-              style={{ height: "300px" }}
-            >
-              <div
-                ref={mapContainer}
-                className="map-container absolute left-0 top-0 w-full rounded-lg"
-                style={{ height: "300px" }}
-              />
-              <div className="absolute" style={{ top: "12px", left: "12px" }}>
-                <CompassDisplay />
-              </div>
-              <div
-                className="absolute"
-                style={{ bottom: "12px", right: "12px" }}
-              >
-                <SpeedDisplay />
-              </div>
-            </div>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default MapSpeedLiveWidget;
diff --git a/dashboard/src/pages/gr24/mobile/widgets/SpeedLiveWidget.tsx b/dashboard/src/pages/gr24/mobile/widgets/SpeedLiveWidget.tsx
deleted file mode 100644
index cc94486a..00000000
--- a/dashboard/src/pages/gr24/mobile/widgets/SpeedLiveWidget.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useEffect, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { Mobile, initMobile } from "@/models/gr24/mobile";
-import { MAPACHE_WS_URL } from "@/consts/config";
-
-function SpeedLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/mobile`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [messageJson, setMessageJson] = useState<Mobile>(initMobile);
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      setMessageJson(data);
-    }
-  }, [lastMessage]);
-
-  const getCompassString = () => {
-    const compass = ["N", "NE", "E", "SE", "S", "SW", "W", "NW"];
-    const index = Math.round(messageJson.heading / 45) % 8;
-    return compass[index];
-  };
-
-  const CompassDisplay = () => {
-    return (
-      <div className="flex h-full flex-col items-center justify-center p-4 text-center">
-        <h1>
-          {messageJson.heading.toFixed(1)}° {getCompassString()}
-        </h1>
-      </div>
-    );
-  };
-
-  const SpeedDisplay = () => {
-    return (
-      <div className="flex h-full items-center justify-center p-4 text-center">
-        <div className="flex-1">
-          <h1 className="text-6xl">
-            {(messageJson.speed * 2.23694).toFixed(0)}
-          </h1>
-          <div className="text-2xl font-semibold">MPH</div>
-        </div>
-        <div
-          className="mx-2 border-l border-gray-400"
-          style={{ height: "100px" }}
-        ></div>
-        <div className="flex-1">
-          <h1 className="text-6xl">{(messageJson.speed * 3.6).toFixed(0)}</h1>
-          <div className="text-2xl font-semibold">KMPH</div>
-        </div>
-      </div>
-    );
-  };
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div className="flex h-full w-full flex-col">
-            <div className="mt-8">
-              <CompassDisplay />
-            </div>
-            <div className="flex-1">
-              <SpeedDisplay />
-            </div>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default SpeedLiveWidget;
diff --git a/dashboard/src/pages/gr24/nodes/NodesPage.tsx b/dashboard/src/pages/gr24/nodes/NodesPage.tsx
deleted file mode 100644
index c5754327..00000000
--- a/dashboard/src/pages/gr24/nodes/NodesPage.tsx
+++ /dev/null
@@ -1,374 +0,0 @@
-import Layout from "@/components/Layout";
-import { Card } from "@/components/ui/card";
-import React, { useMemo } from "react";
-import ReactFlow, { Handle, Position } from "reactflow";
-
-import "reactflow/dist/style.css";
-
-function NodesPage() {
-  React.useEffect(() => {}, []);
-
-  const nodeTypes = useMemo(() => {
-    return {
-      wheel: ({ data }: { data: any }) => {
-        return (
-          <div
-            className="border-primary-500 flex items-center justify-center rounded-md border bg-card text-xl font-bold text-white"
-            style={{
-              width: 60,
-              height: 125,
-            }}
-          >
-            {data.label}
-            <Handle
-              type="target"
-              position={Position.Top}
-              className="!bg-gr-pink opacity-0"
-            />
-            <Handle
-              type="source"
-              position={Position.Bottom}
-              className="!bg-gr-pink opacity-0"
-            />
-          </div>
-        );
-      },
-      acu: ({ data }: { data: any }) => {
-        return (
-          <div
-            className="border-primary-500 flex items-center justify-center rounded-md border bg-card text-xl font-bold text-white"
-            style={{
-              width: 200,
-              height: 75,
-            }}
-          >
-            {data.label}
-            <Handle
-              type="target"
-              position={Position.Top}
-              className="!bg-gr-pink opacity-0"
-            />
-            <Handle
-              type="source"
-              position={Position.Bottom}
-              className="!bg-gr-pink opacity-0"
-            />
-          </div>
-        );
-      },
-      inverter: ({ data }: { data: any }) => {
-        return (
-          <div
-            className="border-primary-500 flex items-center justify-center rounded-md border bg-card text-xl font-bold text-white"
-            style={{
-              width: 150,
-              height: 75,
-            }}
-          >
-            {data.label}
-            <Handle
-              type="target"
-              position={Position.Top}
-              className="!bg-gr-pink opacity-0"
-            />
-            <Handle
-              type="source"
-              position={Position.Bottom}
-              className="!bg-gr-pink opacity-0"
-            />
-          </div>
-        );
-      },
-      ecu: ({ data }: { data: any }) => {
-        return (
-          <div
-            className="border-primary-500 flex items-center justify-center rounded-md border bg-card text-xl font-bold text-white"
-            style={{
-              width: 150,
-              height: 150,
-            }}
-          >
-            {data.label}
-            <Handle
-              type="target"
-              position={Position.Top}
-              className="!bg-gr-pink opacity-0"
-            />
-            <Handle
-              type="source"
-              position={Position.Bottom}
-              className="!bg-gr-pink opacity-0"
-            />
-          </div>
-        );
-      },
-      dpanel: ({ data }: { data: any }) => {
-        return (
-          <div
-            className="border-primary-500 flex items-center justify-center rounded-md border bg-card text-xl font-bold text-white"
-            style={{
-              width: 250,
-              height: 50,
-            }}
-          >
-            {data.label}
-            <Handle
-              type="target"
-              position={Position.Top}
-              className="!bg-gr-pink opacity-0"
-            />
-            <Handle
-              type="source"
-              position={Position.Bottom}
-              className="!bg-gr-pink opacity-0"
-            />
-          </div>
-        );
-      },
-      steering: ({ data }: { data: any }) => {
-        return (
-          <div
-            className="border-primary-500 flex items-center justify-center rounded-md border bg-card text-xl font-bold text-white"
-            style={{
-              width: 100,
-              height: 75,
-            }}
-          >
-            {data.label}
-            <Handle
-              type="target"
-              position={Position.Top}
-              className="!bg-gr-pink opacity-0"
-            />
-            <Handle
-              type="source"
-              position={Position.Bottom}
-              className="!bg-gr-pink opacity-0"
-            />
-          </div>
-        );
-      },
-      node_small: ({ data }: { data: any }) => {
-        return (
-          <div
-            className="border-primary-500 flex items-center justify-center rounded-md border bg-card text-xl font-bold text-white"
-            style={{
-              width: 100,
-              height: 50,
-            }}
-          >
-            {data.label}
-            <Handle
-              type="target"
-              position={Position.Top}
-              className="!bg-gr-pink opacity-0"
-            />
-            <Handle
-              type="source"
-              position={Position.Bottom}
-              className="!bg-gr-pink opacity-0"
-            />
-          </div>
-        );
-      },
-    };
-  }, []);
-
-  const initialNodes = [
-    {
-      id: "wheel/fl",
-      position: { x: 20, y: 100 },
-      data: { label: "FL" },
-      type: "wheel",
-    },
-    {
-      id: "wheel/fr",
-      position: { x: 400, y: 100 },
-      data: { label: "FR" },
-      type: "wheel",
-    },
-    {
-      id: "wheel/rl",
-      position: { x: 20, y: 600 },
-      data: { label: "RL" },
-      type: "wheel",
-    },
-    {
-      id: "wheel/rr",
-      position: { x: 400, y: 600 },
-      data: { label: "RR" },
-      type: "wheel",
-    },
-    {
-      id: "acu",
-      position: { x: 135, y: 700 },
-      data: { label: "ACU" },
-      type: "acu",
-    },
-    {
-      id: "inverter",
-      position: { x: 160, y: 600 },
-      data: { label: "Inverter" },
-      type: "inverter",
-    },
-    {
-      id: "vdm",
-      position: { x: 160, y: 400 },
-      data: { label: "VDM" },
-      type: "ecu",
-    },
-    {
-      id: "tcm",
-      position: { x: 240, y: 50 },
-      data: { label: "TCM" },
-      type: "node_small",
-    },
-    {
-      id: "bcm",
-      position: { x: 125, y: 50 },
-      data: { label: "BCM" },
-      type: "node_small",
-    },
-    {
-      id: "pedal",
-      position: { x: 185, y: 120 },
-      data: { label: "Pedals" },
-      type: "node_small",
-    },
-    {
-      id: "steering",
-      position: { x: 185, y: 260 },
-      data: { label: "Steering" },
-      type: "steering",
-    },
-    {
-      id: "dpanel",
-      position: { x: 110, y: 190 },
-      data: { label: "Dash Panel" },
-      type: "dpanel",
-    },
-  ];
-  const animated = false;
-  const initialEdges = [
-    { id: "1", target: "bcm", source: "tcm", animated: animated },
-    {
-      id: "2",
-      source: "tcm",
-      target: "pedal",
-      animated: animated,
-    },
-    {
-      id: "2",
-      source: "pedal",
-      target: "dpanel",
-      animated: animated,
-    },
-    {
-      id: "3",
-      source: "pedal",
-      target: "dpanel",
-      animated: animated,
-    },
-    {
-      id: "4",
-      source: "dpanel",
-      target: "steering",
-      animated: animated,
-    },
-    {
-      id: "5",
-      source: "steering",
-      target: "vdm",
-      animated: animated,
-    },
-    {
-      id: "6",
-      source: "vdm",
-      target: "inverter",
-      animated: animated,
-    },
-    {
-      id: "7",
-      source: "inverter",
-      target: "acu",
-      animated: animated,
-    },
-    {
-      id: "8",
-      source: "wheel/fl",
-      target: "wheel/rl",
-      animated: animated,
-    },
-    {
-      id: "8",
-      source: "wheel/fr",
-      target: "wheel/rr",
-      animated: animated,
-    },
-    {
-      id: "10",
-      target: "wheel/rl",
-      source: "bcm",
-      animated: animated,
-    },
-    {
-      id: "11",
-      target: "wheel/rr",
-      source: "bcm",
-      animated: animated,
-    },
-    // {
-    //   id: "8",
-    //   target: "wheel/fl",
-    //   source: "bcm",
-    //   animated: animated,
-    // },
-    // {
-    //   id: "9",
-    //   target: "wheel/fr",
-    //   source: "bcm",
-    //   animated: animated,
-    // },
-    // {
-    //   id: "10",
-    //   target: "wheel/rl",
-    //   source: "bcm",
-    //   animated: animated,
-    // },
-    // {
-    //   id: "11",
-    //   target: "wheel/rr",
-    //   source: "bcm",
-    //   animated: animated,
-    // },
-  ];
-
-  return (
-    <>
-      <Layout activeTab="nodes">
-        <h1>Nodes</h1>
-        <p className="mt-2 text-neutral-400">
-          <div className="flex">
-            Haha it's a{" "}
-            <div className="mx-1 w-min rounded-md border bg-card px-2">
-              Nodes.h
-            </div>{" "}
-            reference
-          </div>
-        </p>
-        <div className="flex flex-wrap">
-          <Card style={{ width: "50vw", height: "70vh" }} className="my-4">
-            <ReactFlow
-              nodes={initialNodes}
-              edges={initialEdges}
-              nodeTypes={nodeTypes}
-              proOptions={{ hideAttribution: true }}
-            ></ReactFlow>
-          </Card>
-        </div>
-      </Layout>
-    </>
-  );
-}
-
-export default NodesPage;
diff --git a/dashboard/src/pages/gr24/pedal/PedalDetailsPage.tsx b/dashboard/src/pages/gr24/pedal/PedalDetailsPage.tsx
deleted file mode 100644
index 5badd668..00000000
--- a/dashboard/src/pages/gr24/pedal/PedalDetailsPage.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import { Loader2 } from "lucide-react";
-import React, { useCallback } from "react";
-import { checkCredentials } from "@/lib/auth";
-import { useNavigate } from "react-router-dom";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import { Button } from "@/components/ui/button";
-import { Progress } from "@/components/ui/progress";
-
-function PedalDetailsPage() {
-  const navigate = useNavigate();
-  const [loading, setLoading] = React.useState(true);
-
-  const [socketUrl] = React.useState("ws://localhost:7001/ws/gr24/pedal");
-  const { sendMessage, lastMessage, readyState } = useWebSocket(socketUrl);
-
-  const [jsonData, setJsonData] = React.useState([{}]);
-
-  React.useEffect(() => {
-    init();
-    if (lastMessage !== null) {
-      setJsonData((prev) => [
-        ...prev.concat(JSON.parse(lastMessage.data)).slice(-100),
-      ]);
-    }
-  }, [lastMessage]);
-
-  const handleClickSendMessage = useCallback(() => sendMessage("Hello"), []);
-
-  const connectionStatus = {
-    [ReadyState.CONNECTING]: "Connecting",
-    [ReadyState.OPEN]: "Open",
-    [ReadyState.CLOSING]: "Closing",
-    [ReadyState.CLOSED]: "Closed",
-    [ReadyState.UNINSTANTIATED]: "Uninstantiated",
-  }[readyState];
-
-  const init = async () => {
-    const currentRoute = window.location.pathname + window.location.search;
-    const status = await checkCredentials();
-    if (status != 0) {
-      navigate(`/auth/register?route=${currentRoute}`);
-    } else {
-      setLoading(false);
-    }
-  };
-
-  const LoadingComponent = () => {
-    return (
-      <div className="flex h-full flex-col items-center justify-center p-32">
-        <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-      </div>
-    );
-  };
-
-  return loading ? (
-    <LoadingComponent />
-  ) : (
-    <>
-      <div className="flex p-16">
-        <div className="h-screen w-full text-center">
-          <div>The WebSocket is currently {connectionStatus}</div>
-          <Button
-            className="m-2"
-            onClick={handleClickSendMessage}
-            disabled={readyState !== ReadyState.OPEN}
-          >
-            Send debug message
-          </Button>
-          <div className="flex w-full flex-row p-2">
-            <div className="m-4 w-1/2 text-start">
-              {lastMessage ? (
-                <div>
-                  <div>Last Message ID: {JSON.parse(lastMessage.data).id}</div>
-                  <Progress
-                    className="mt-4"
-                    value={Math.floor(JSON.parse(lastMessage.data).apps_one)}
-                  />
-                  <div className="mt-2">
-                    APPS One: {JSON.parse(lastMessage.data).apps_one}
-                  </div>
-                  <Progress
-                    className="mt-4"
-                    value={Math.floor(JSON.parse(lastMessage.data).apps_two)}
-                  />
-                  <div className="mt-2">
-                    APPS Two: {JSON.parse(lastMessage.data).apps_two}
-                  </div>
-                  <Progress
-                    className="mt-4"
-                    value={Math.floor(
-                      (JSON.parse(lastMessage.data).brake_pressure_front /
-                        256) *
-                        100,
-                    )}
-                  />
-                  <div className="mt-2">
-                    Brake Pressure Front:{" "}
-                    {JSON.parse(lastMessage.data).brake_pressure_front}
-                  </div>
-                  <Progress
-                    className="mt-4"
-                    value={Math.floor(
-                      (JSON.parse(lastMessage.data).brake_pressure_rear / 256) *
-                        100,
-                    )}
-                  />
-                  <div className="mt-2">
-                    Brake Pressure Rear:{" "}
-                    {JSON.parse(lastMessage.data).brake_pressure_rear}
-                  </div>
-                </div>
-              ) : (
-                <div>No data</div>
-              )}
-            </div>
-            <div className="m-4 w-1/2 text-wrap text-start text-slate-500">
-              <h1 className="text-xl text-white">
-                Message Count: {jsonData.length}
-              </h1>
-              {jsonData.reverse().map((message, idx) => (
-                <div key={idx}>{JSON.stringify(message)}</div>
-              ))}
-            </div>
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export default PedalDetailsPage;
diff --git a/dashboard/src/pages/gr24/pedal/PedalPage.tsx b/dashboard/src/pages/gr24/pedal/PedalPage.tsx
deleted file mode 100644
index 1ada4e50..00000000
--- a/dashboard/src/pages/gr24/pedal/PedalPage.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import Layout from "@/components/Layout";
-import { useEffect, useState } from "react";
-import { Card } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { pedalLiveWidgets, vdmLiveWidgets } from "@/consts/config";
-import DebugRawLiveWidget from "./widgets/DebugRawLiveWidget";
-import PedalLiveWidget from "./widgets/PedalLiveWidget";
-
-function PedalPage() {
-  const [selectingWidgets, setSelectingWidgets] = useState(false);
-  const [widgets, setWidgets] = useState([
-    {
-      name: "Pedal Live",
-      width: 300,
-      height: 300,
-      component: <PedalLiveWidget />,
-    },
-    {
-      name: "Raw Debug Live",
-      width: 600,
-      height: 300,
-      component: <DebugRawLiveWidget />,
-    },
-  ]);
-
-  useEffect(() => {});
-
-  function addToWidgets(widget) {
-    if (!widgets.some((item) => item.name === widget.name)) {
-      setWidgets((prevWidgets) => [...prevWidgets, widget]);
-    }
-  }
-
-  function removeFromWidgets(widget) {
-    setWidgets((prevWidgets) =>
-      prevWidgets.filter((item) => item.name !== widget.name),
-    );
-  }
-
-  const SelectWidgetsComponent = () => {
-    return (
-      <div className="p-4">
-        <Card className="p-4">
-          <h3>Select Widgets</h3>
-          {pedalLiveWidgets.map((widget) => (
-            <div
-              key={widget.name}
-              className="my-2 flex items-center justify-between"
-            >
-              <p>{widget.name}</p>
-              {widgets.some((item) => item.name === widget.name) ? (
-                <Button
-                  variant="destructive"
-                  onClick={() => {
-                    removeFromWidgets(widget);
-                  }}
-                >
-                  Remove
-                </Button>
-              ) : (
-                <Button
-                  onClick={() => {
-                    addToWidgets(widget);
-                  }}
-                >
-                  Add
-                </Button>
-              )}
-            </div>
-          ))}
-        </Card>
-      </div>
-    );
-  };
-
-  return (
-    <>
-      <Layout activeTab="pedal">
-        <div className="flex flex-row items-end justify-between">
-          <div>
-            <h1>Pedals</h1>
-            <p className="mt-2 text-neutral-400">pedals page</p>
-          </div>
-          <Button
-            onClick={() => {
-              setSelectingWidgets(!selectingWidgets);
-            }}
-            variant={selectingWidgets ? "secondary" : "outline"}
-          >
-            {selectingWidgets ? "Save" : "Select Widgets"}
-          </Button>
-        </div>
-        {selectingWidgets ? (
-          <SelectWidgetsComponent />
-        ) : (
-          <div className="flex flex-wrap">
-            {widgets.map((widget) => (
-              <Card
-                key={widget.id}
-                style={{ width: widget.width, height: widget.height }}
-                className="my-3 mr-6 overflow-auto"
-              >
-                {widget.component}
-              </Card>
-            ))}
-          </div>
-        )}
-      </Layout>
-    </>
-  );
-}
-
-export default PedalPage;
diff --git a/dashboard/src/pages/gr24/pedal/widgets/DebugRawLiveWidget.tsx b/dashboard/src/pages/gr24/pedal/widgets/DebugRawLiveWidget.tsx
deleted file mode 100644
index 2fcf3964..00000000
--- a/dashboard/src/pages/gr24/pedal/widgets/DebugRawLiveWidget.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useEffect, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { Mobile, initMobile } from "@/models/gr24/mobile";
-import { MAPACHE_WS_URL } from "@/consts/config";
-
-function DebugRawLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/pedal`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [messageJson, setMessageJson] = useState<Mobile>(initMobile);
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      setMessageJson(data);
-    }
-  }, [lastMessage]);
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div>
-            <div className="m-4 flex w-full flex-col">
-              {Object.entries(messageJson).map(([key, value]) => (
-                <div key={key} className="flex">
-                  <div className="pr-2 font-semibold">{key}:</div>
-                  <div className="font-semibold text-gray-400">
-                    {value.toString()}
-                  </div>
-                </div>
-              ))}
-            </div>
-            <div className="mx-4 flex">
-              <div className="pr-2 font-semibold">Last Update:</div>
-              <div className="font-semibold text-gray-400">
-                {new Date(messageJson.created_at).toISOString()}
-              </div>
-            </div>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default DebugRawLiveWidget;
diff --git a/dashboard/src/pages/gr24/pedal/widgets/PedalLiveWidget.tsx b/dashboard/src/pages/gr24/pedal/widgets/PedalLiveWidget.tsx
deleted file mode 100644
index 5c2803c7..00000000
--- a/dashboard/src/pages/gr24/pedal/widgets/PedalLiveWidget.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { Loader2 } from "lucide-react";
-import React from "react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import { Progress } from "@/components/ui/progress";
-import { Separator } from "@/components/ui/separator";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { MAPACHE_WS_URL } from "@/consts/config";
-
-function GR24PedalLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/pedal`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full p-4">
-        {lastMessage ? (
-          <div className="">
-            <div className="flex items-center justify-center">
-              <div className="w-1/3 text-start">
-                <p>APPS 1:</p>
-                <h3>
-                  {parseFloat(JSON.parse(lastMessage.data).apps_one).toFixed(2)}
-                </h3>
-              </div>
-              <div className="w-2/3">
-                <Progress
-                  value={Math.floor(JSON.parse(lastMessage.data).apps_one)}
-                />
-              </div>
-            </div>
-            <div className="flex items-center justify-center">
-              <div className="w-1/3 text-start">
-                <p>APPS 2:</p>
-                <h3>
-                  {parseFloat(JSON.parse(lastMessage.data).apps_two).toFixed(2)}
-                </h3>
-              </div>
-              <div className="w-2/3">
-                <Progress
-                  value={Math.floor(JSON.parse(lastMessage.data).apps_two)}
-                />
-              </div>
-            </div>
-            <Separator className="my-2" />
-            <div className="flex items-center justify-center">
-              <div className="w-1/2 text-start">
-                <p>APPS 1 RAW:</p>
-              </div>
-              <h3>{JSON.parse(lastMessage.data).apps_one_raw}</h3>
-            </div>
-            <div className="flex items-center justify-center">
-              <div className="w-1/2 text-start">
-                <p>APPS 2 RAW:</p>
-              </div>
-              <h3>{JSON.parse(lastMessage.data).apps_two_raw}</h3>
-            </div>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default GR24PedalLiveWidget;
diff --git a/dashboard/src/pages/gr24/vdm/VDMPage.tsx b/dashboard/src/pages/gr24/vdm/VDMPage.tsx
deleted file mode 100644
index 767c288b..00000000
--- a/dashboard/src/pages/gr24/vdm/VDMPage.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import Layout from "@/components/Layout";
-import { useEffect, useState } from "react";
-import { Card } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { vdmLiveWidgets } from "@/consts/config";
-import DebugRawLiveWidget from "./widgets/DebugRawLiveWidget";
-
-function VDMPage() {
-  const [selectingWidgets, setSelectingWidgets] = useState(false);
-  const [widgets, setWidgets] = useState([
-    {
-      name: "Raw Debug Live",
-      width: 600,
-      height: 900,
-      component: <DebugRawLiveWidget />,
-    },
-  ]);
-
-  useEffect(() => {});
-
-  function addToWidgets(widget) {
-    if (!widgets.some((item) => item.name === widget.name)) {
-      setWidgets((prevWidgets) => [...prevWidgets, widget]);
-    }
-  }
-
-  function removeFromWidgets(widget) {
-    setWidgets((prevWidgets) =>
-      prevWidgets.filter((item) => item.name !== widget.name),
-    );
-  }
-
-  const SelectWidgetsComponent = () => {
-    return (
-      <div className="p-4">
-        <Card className="p-4">
-          <h3>Select Widgets</h3>
-          {vdmLiveWidgets.map((widget) => (
-            <div
-              key={widget.name}
-              className="my-2 flex items-center justify-between"
-            >
-              <p>{widget.name}</p>
-              {widgets.some((item) => item.name === widget.name) ? (
-                <Button
-                  variant="destructive"
-                  onClick={() => {
-                    removeFromWidgets(widget);
-                  }}
-                >
-                  Remove
-                </Button>
-              ) : (
-                <Button
-                  onClick={() => {
-                    addToWidgets(widget);
-                  }}
-                >
-                  Add
-                </Button>
-              )}
-            </div>
-          ))}
-        </Card>
-      </div>
-    );
-  };
-
-  return (
-    <>
-      <Layout activeTab="vdm">
-        <div className="flex flex-row items-end justify-between">
-          <div>
-            <h1>VDM</h1>
-            <p className="mt-2 text-neutral-400">vdm page</p>
-          </div>
-          <Button
-            onClick={() => {
-              setSelectingWidgets(!selectingWidgets);
-            }}
-            variant={selectingWidgets ? "secondary" : "outline"}
-          >
-            {selectingWidgets ? "Save" : "Select Widgets"}
-          </Button>
-        </div>
-        {selectingWidgets ? (
-          <SelectWidgetsComponent />
-        ) : (
-          <div className="flex flex-wrap">
-            {widgets.map((widget) => (
-              <Card
-                key={widget.id}
-                style={{ width: widget.width, height: widget.height }}
-                className="my-3 mr-6 overflow-auto"
-              >
-                {widget.component}
-              </Card>
-            ))}
-          </div>
-        )}
-      </Layout>
-    </>
-  );
-}
-
-export default VDMPage;
diff --git a/dashboard/src/pages/gr24/vdm/widgets/DebugRawLiveWidget.tsx b/dashboard/src/pages/gr24/vdm/widgets/DebugRawLiveWidget.tsx
deleted file mode 100644
index b7e2bd6e..00000000
--- a/dashboard/src/pages/gr24/vdm/widgets/DebugRawLiveWidget.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useEffect, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { Mobile, initMobile } from "@/models/gr24/mobile";
-import { MAPACHE_WS_URL } from "@/consts/config";
-
-function DebugRawLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/vdm`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [messageJson, setMessageJson] = useState<Mobile>(initMobile);
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      setMessageJson(data);
-    }
-  }, [lastMessage]);
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div>
-            <div className="m-4 flex w-full flex-col">
-              {Object.entries(messageJson).map(([key, value]) => (
-                <div key={key} className="flex">
-                  <div className="pr-2 font-semibold">{key}:</div>
-                  <div className="font-semibold text-gray-400">
-                    {value.toString()}
-                  </div>
-                </div>
-              ))}
-            </div>
-            <div className="mx-4 flex">
-              <div className="pr-2 font-semibold">Last Update:</div>
-              <div className="font-semibold text-gray-400">
-                {new Date(messageJson.created_at).toISOString()}
-              </div>
-            </div>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default DebugRawLiveWidget;
diff --git a/dashboard/src/pages/gr24/wheel/WheelPage.tsx b/dashboard/src/pages/gr24/wheel/WheelPage.tsx
deleted file mode 100644
index 2048a20e..00000000
--- a/dashboard/src/pages/gr24/wheel/WheelPage.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import Layout from "@/components/Layout";
-import { useEffect, useState } from "react";
-import { Card } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { vdmLiveWidgets, wheelLiveWidgets } from "@/consts/config";
-import DebugRawLiveWidget from "./widgets/DebugRawLiveWidget";
-
-function WheelPage() {
-  const [selectingWidgets, setSelectingWidgets] = useState(false);
-  const [widgets, setWidgets] = useState([
-    {
-      name: "Raw Debug Live",
-      width: 600,
-      height: 300,
-      component: <DebugRawLiveWidget />,
-    },
-  ]);
-
-  useEffect(() => {});
-
-  function addToWidgets(widget) {
-    if (!widgets.some((item) => item.name === widget.name)) {
-      setWidgets((prevWidgets) => [...prevWidgets, widget]);
-    }
-  }
-
-  function removeFromWidgets(widget) {
-    setWidgets((prevWidgets) =>
-      prevWidgets.filter((item) => item.name !== widget.name),
-    );
-  }
-
-  const SelectWidgetsComponent = () => {
-    return (
-      <div className="p-4">
-        <Card className="p-4">
-          <h3>Select Widgets</h3>
-          {wheelLiveWidgets.map((widget) => (
-            <div
-              key={widget.name}
-              className="my-2 flex items-center justify-between"
-            >
-              <p>{widget.name}</p>
-              {widgets.some((item) => item.name === widget.name) ? (
-                <Button
-                  variant="destructive"
-                  onClick={() => {
-                    removeFromWidgets(widget);
-                  }}
-                >
-                  Remove
-                </Button>
-              ) : (
-                <Button
-                  onClick={() => {
-                    addToWidgets(widget);
-                  }}
-                >
-                  Add
-                </Button>
-              )}
-            </div>
-          ))}
-        </Card>
-      </div>
-    );
-  };
-
-  return (
-    <>
-      <Layout activeTab="wheel">
-        <div className="flex flex-row items-end justify-between">
-          <div>
-            <h1>Wheels</h1>
-            <p className="mt-2 text-neutral-400">wheels page</p>
-          </div>
-          <Button
-            onClick={() => {
-              setSelectingWidgets(!selectingWidgets);
-            }}
-            variant={selectingWidgets ? "secondary" : "outline"}
-          >
-            {selectingWidgets ? "Save" : "Select Widgets"}
-          </Button>
-        </div>
-        {selectingWidgets ? (
-          <SelectWidgetsComponent />
-        ) : (
-          <div className="flex flex-wrap">
-            {widgets.map((widget) => (
-              <Card
-                key={widget.id}
-                style={{ width: widget.width, height: widget.height }}
-                className="my-3 mr-6 overflow-auto"
-              >
-                {widget.component}
-              </Card>
-            ))}
-          </div>
-        )}
-      </Layout>
-    </>
-  );
-}
-
-export default WheelPage;
diff --git a/dashboard/src/pages/gr24/wheel/widgets/DebugRawLiveWidget.tsx b/dashboard/src/pages/gr24/wheel/widgets/DebugRawLiveWidget.tsx
deleted file mode 100644
index c777a87c..00000000
--- a/dashboard/src/pages/gr24/wheel/widgets/DebugRawLiveWidget.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Loader2 } from "lucide-react";
-import useWebSocket, { ReadyState } from "react-use-websocket";
-import React, { useEffect, useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCircleXmark } from "@fortawesome/free-regular-svg-icons";
-import { Mobile, initMobile } from "@/models/gr24/mobile";
-import { MAPACHE_WS_URL } from "@/consts/config";
-
-function DebugRawLiveWidget() {
-  const [socketUrl] = React.useState(`${MAPACHE_WS_URL}/ws/gr24/wheel`);
-  const { lastMessage, readyState } = useWebSocket(socketUrl);
-  const [messageJson, setMessageJson] = useState<Mobile>(initMobile);
-
-  useEffect(() => {
-    if (lastMessage !== null) {
-      const data = JSON.parse(lastMessage.data);
-      setMessageJson(data);
-    }
-  }, [lastMessage]);
-
-  const LoadingComponent = () => {
-    if (readyState === ReadyState.CONNECTING) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-          <p className="mt-2 text-neutral-400">Connecting...</p>
-        </div>
-      );
-    } else if (readyState === ReadyState.CLOSED) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <FontAwesomeIcon
-            icon={faCircleXmark}
-            className="mr-2 h-8 w-8 text-red-500"
-          />
-          <p className="mt-2 text-neutral-400">Connection Closed</p>
-        </div>
-      );
-    } else {
-      return (
-        <div className="flex h-full flex-col items-center justify-center">
-          <Loader2 className="mr-2 h-8 w-8 animate-spin" />
-        </div>
-      );
-    }
-  };
-
-  return (
-    <>
-      <div className="h-full w-full">
-        {lastMessage ? (
-          <div>
-            <div className="m-4 flex w-full flex-col">
-              {Object.entries(messageJson).map(([key, value]) => (
-                <div key={key} className="flex">
-                  <div className="pr-2 font-semibold">{key}:</div>
-                  <div className="font-semibold text-gray-400">
-                    {value.toString()}
-                  </div>
-                </div>
-              ))}
-            </div>
-            <div className="mx-4 flex">
-              <div className="pr-2 font-semibold">Last Update:</div>
-              <div className="font-semibold text-gray-400">
-                {new Date(messageJson.created_at).toISOString()}
-              </div>
-            </div>
-          </div>
-        ) : (
-          <LoadingComponent />
-        )}
-      </div>
-    </>
-  );
-}
-
-export default DebugRawLiveWidget;
diff --git a/gr25/model/ecu.go b/gr25/model/ecu.go
index a86ffe58..8e06518e 100644
--- a/gr25/model/ecu.go
+++ b/gr25/model/ecu.go
@@ -2,9 +2,9 @@ package model
 
 import mp "github.com/gaucho-racing/mapache-go"
 
-var ecuStatusOne = mp.Message{
-	mp.NewField("ecu_state", 1, mp.Unsigned, mp.BigEndian, nil),
-	mp.NewField("ecu_status_flags", 3, mp.Unsigned, mp.BigEndian, func(f mp.Field) []mp.Signal {
+var ECUStatusOne = mp.Message{
+	mp.NewField("ecu_state", 1, mp.Unsigned, mp.LittleEndian, nil),
+	mp.NewField("ecu_status_flags", 3, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
 		signals := []mp.Signal{}
 		bitMap := []string{
 			"ecu_status_acu",
@@ -32,7 +32,7 @@ var ecuStatusOne = mp.Message{
 		}
 		return signals
 	}),
-	mp.NewField("ecu_maps", 1, mp.Unsigned, mp.BigEndian, func(f mp.Field) []mp.Signal {
+	mp.NewField("ecu_maps", 1, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
 		signals := []mp.Signal{}
 		signals = append(signals, mp.Signal{
 			Name:     "ecu_power_level",
@@ -46,7 +46,7 @@ var ecuStatusOne = mp.Message{
 		})
 		return signals
 	}),
-	mp.NewField("ecu_max_cell_temp", 1, mp.Unsigned, mp.BigEndian, func(f mp.Field) []mp.Signal {
+	mp.NewField("ecu_max_cell_temp", 1, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
 		signals := []mp.Signal{}
 		signals = append(signals, mp.Signal{
 			Name:     "ecu_max_cell_temp",
@@ -55,7 +55,7 @@ var ecuStatusOne = mp.Message{
 		})
 		return signals
 	}),
-	mp.NewField("ecu_acu_state_of_charge", 1, mp.Unsigned, mp.BigEndian, func(f mp.Field) []mp.Signal {
+	mp.NewField("ecu_acu_state_of_charge", 1, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
 		signals := []mp.Signal{}
 		signals = append(signals, mp.Signal{
 			Name:     "ecu_acu_state_of_charge",
@@ -64,7 +64,7 @@ var ecuStatusOne = mp.Message{
 		})
 		return signals
 	}),
-	mp.NewField("ecu_glv_state_of_charge", 1, mp.Unsigned, mp.BigEndian, func(f mp.Field) []mp.Signal {
+	mp.NewField("ecu_glv_state_of_charge", 1, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
 		signals := []mp.Signal{}
 		signals = append(signals, mp.Signal{
 			Name:     "ecu_glv_state_of_charge",
@@ -74,3 +74,63 @@ var ecuStatusOne = mp.Message{
 		return signals
 	}),
 }
+
+var ECUStatusTwo = mp.Message{
+	mp.NewField("ecu_tractive_system_voltage", 2, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
+		signals := []mp.Signal{}
+		signals = append(signals, mp.Signal{
+			Name:     "ecu_tractive_system_voltage",
+			Value:    float64(f.Value) * 0.01,
+			RawValue: f.Value,
+		})
+		return signals
+	}),
+	mp.NewField("ecu_vehicle_speed", 2, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
+		signals := []mp.Signal{}
+		signals = append(signals, mp.Signal{
+			Name:     "ecu_vehicle_speed",
+			Value:    float64(f.Value) * 0.01,
+			RawValue: f.Value,
+		})
+		return signals
+	}),
+	mp.NewField("ecu_fr_wheel_rpm", 2, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
+		signals := []mp.Signal{}
+		signals = append(signals, mp.Signal{
+			Name:     "ecu_fr_wheel_rpm",
+			Value:    float64(f.Value)*0.1 - 3276.8,
+			RawValue: f.Value,
+		})
+		return signals
+	}),
+	mp.NewField("ecu_fl_wheel_rpm", 2, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
+		signals := []mp.Signal{}
+		signals = append(signals, mp.Signal{
+			Name:     "ecu_fl_wheel_rpm",
+			Value:    float64(f.Value)*0.1 - 3276.8,
+			RawValue: f.Value,
+		})
+		return signals
+	}),
+}
+
+var ECUStatusThree = mp.Message{
+	mp.NewField("ecu_rr_wheel_rpm", 2, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
+		signals := []mp.Signal{}
+		signals = append(signals, mp.Signal{
+			Name:     "ecu_rr_wheel_rpm",
+			Value:    float64(f.Value)*0.1 - 3276.8,
+			RawValue: f.Value,
+		})
+		return signals
+	}),
+	mp.NewField("ecu_rl_wheel_rpm", 2, mp.Unsigned, mp.LittleEndian, func(f mp.Field) []mp.Signal {
+		signals := []mp.Signal{}
+		signals = append(signals, mp.Signal{
+			Name:     "ecu_rl_wheel_rpm",
+			Value:    float64(f.Value)*0.1 - 3276.8,
+			RawValue: f.Value,
+		})
+		return signals
+	}),
+}
diff --git a/gr25/model/message.go b/gr25/model/message.go
index 3be674f4..2b65852d 100644
--- a/gr25/model/message.go
+++ b/gr25/model/message.go
@@ -3,7 +3,9 @@ package model
 import mp "github.com/gaucho-racing/mapache-go"
 
 var messageMap = map[int]mp.Message{
-	0x003: ecuStatusOne,
+	0x003: ECUStatusOne,
+	0x004: ECUStatusTwo,
+	0x005: ECUStatusThree,
 }
 
 func GetMessage(id int) mp.Message {