diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index bd2a31f9..efd417cc 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -16,7 +16,6 @@
     <uses-permission
         android:name="android.permission.ACCESS_COARSE_LOCATION"
         android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index b13bbf19..56f17e57 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -14,6 +14,13 @@
         android:name="android.permission.ACCESS_COARSE_LOCATION"
         android:maxSdkVersion="30" />
 
+    <uses-permission-sdk-23
+        android:name="android.permission.ACCESS_COARSE_LOCATION"
+        tools:node="remove" />
+    <uses-permission-sdk-23
+        android:name="android.permission.ACCESS_FINE_LOCATION"
+        tools:node="remove" />
+
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
     <uses-permission android:name="android.hardware.sensor.proximity" />
diff --git a/pubspec.lock b/pubspec.lock
index a5ea3d10..ce83fd2a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1011,10 +1011,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "2c582551839386fa7ddbc7770658be7c0f87f388a4bff72066478f597c34d17f"
+      sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "8.0.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -1192,14 +1192,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
-  pretty_dio_logger:
-    dependency: "direct dev"
-    description:
-      name: pretty_dio_logger
-      sha256: "00b80053063935cf9a6190da344c5373b9d0e92da4c944c878ff2fbef0ef6dc2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.1"
   process:
     dependency: transitive
     description:
@@ -1763,12 +1755,12 @@ packages:
     dependency: "direct main"
     description:
       name: wakelock_plus
-      sha256: c8b7cc80f045533b40a0e6c9109905494e3cf32c0fbd5c62616998e0de44003f
+      sha256: "14758533319a462ffb5aa3b7ddb198e59b29ac3b02da14173a1715d65d4e6e68"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.4"
+    version: "1.2.5"
   wakelock_plus_platform_interface:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: wakelock_plus_platform_interface
       sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16"
diff --git a/pubspec.yaml b/pubspec.yaml
index 925e5281..d0afac04 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -19,79 +19,94 @@ dependencies:
   cross_platform: ^3.0.1
   flutter_riverpod: ^2.5.1
   logging: ^1.2.0
-  logging_flutter: ^3.0.0
   flutter_reactive_ble: ^5.3.1
   go_router: ^14.0.2
-  pedometer: # Needs gradle namespace
-    git:
-      url: https://github.com/cph-cachet/flutter-plugins
-      path: packages/pedometer
-  proximity_sensor: # Needs gradle namespace
-    git:
-      url: https://github.com/Codel1417/flutter-proximity-sensor-plugin
-  sensors_plus: ^5.0.1
-  shake: # Needs gradle namespace
-    git:
-      url: https://github.com/Codel1417/shake
-      ref: dieringe
-  flex_color_scheme: ^7.3.1
-  flutter_joystick: ^0.0.4
-  sentry_flutter: ^7.20.1
-  sentry_logging: ^7.20.0
-  sentry_hive: ^7.20.0
-  sentry_dio: ^7.20.0
-  vector_math: ^2.1.4
+  vector_math: ^2.1.4 # used for joystick
   collection: ^1.18.0
   flutter_foreground_service: # Needs gradle namespace
     git:
       url: https://github.com/cph-cachet/flutter-plugins
       path: packages/flutter_foreground_service
-  upgrader: ^10.3.0
-  chart_sparkline: ^1.0.15+1
-  package_info_plus: ^7.0.0
-  multi_value_listenable_builder: ^0.0.2
-  multi_listenable_builder: ^1.0.0
-  feedback_sentry: ^3.0.0
-  flutter_android_volume_keydown: # Needs gradle namespace
-    git:
-      url: https://github.com/Codel1417/flutter_android_volume_keydown
-      ref: feature/media_button
+  package_info_plus: ^8.0.0
   intl: #pinned to flutter version
   url_launcher: ^6.2.6
   app_settings: ^5.1.1
-  flex_color_picker: ^3.4.1
-  flutter_adaptive_scaffold: ^0.1.10+2
-  hive: ^2.2.3
-  hive_flutter: ^1.1.0
+
   path_provider: ^2.1.3
   uuid: ^4.4.0
   plausible_analytics: ^0.3.0
-  dio: ^5.4.3+1
   json_serializable: ^6.8.0
   json_annotation: ^4.9.0
-  crypto: ^3.0.3
-  animate_do: ^3.3.4
-  fl_chart: ^0.67.0
-  file_picker: ^8.0.3
-  wakelock_plus: ^1.2.4
-  wakelock_plus_platform_interface: ^1.2.1
+  crypto: ^3.0.3 # used for md5 hash checking during ota download
+  file_picker: ^8.0.3 # used to manually select firmware file
+  wakelock_plus: ^1.2.5
   #pod_player: ^0.2.2
   #tivy: ^0.1.1
-  pdfx: ^2.6.0
-  in_app_review: ^2.0.9
+
+  circular_buffer: ^0.11.0  # Used for serial console
+  fluttertoast: ^8.2.5
+  back_button_interceptor: ^7.0.3 # for rejecting the back button in some places due to flutter/Go Router bugs
+  riverpod_annotation: ^2.3.5
+  device_info_plus: ^9.0.3
   install_referrer: # Needs gradle namespace
     git:
       url: https://github.com/undreeyyy/flutter_plugin_install_referrer
       ref: fd87e9b8f0d5ed909e929388244456f72b9b63c7
-  circular_buffer: ^0.11.0
+
+  # Widgets / UI
+  flutter_screen_lock: ^9.0.2 # used to hide dev mode toggle
   introduction_screen: ^3.1.14
   lottie: ^3.1.0
-  fluttertoast: ^8.2.5
-  flutter_screen_lock: ^9.0.2
-  back_button_interceptor: ^7.0.3
-  riverpod_annotation: ^2.3.5
+  flex_color_picker: ^3.4.1
+  flutter_adaptive_scaffold: ^0.1.10+2
+  animate_do: ^3.3.4
+  fl_chart: ^0.67.0
+  chart_sparkline: ^1.0.15+1 # used for the move easing visual
+  flex_color_scheme: ^7.3.1
+  pdfx: ^2.6.0
+  flutter_joystick: ^0.0.4
+  multi_value_listenable_builder: ^0.0.2
+  multi_listenable_builder: ^1.0.0
+  logging_flutter: ^3.0.0
+
+
+  # Dio HTTP
+  dio: ^5.4.3+1
   native_dio_adapter: ^1.3.0
-  device_info_plus: ^9.0.3
+
+  # Sensors
+  pedometer: # Needs gradle namespace
+    git:
+      url: https://github.com/cph-cachet/flutter-plugins
+      path: packages/pedometer
+  proximity_sensor: # Needs gradle namespace
+    git:
+      url: https://github.com/Codel1417/flutter-proximity-sensor-plugin
+  sensors_plus: ^5.0.1
+  shake: # Needs gradle namespace
+    git:
+      url: https://github.com/Codel1417/shake
+      ref: dieringe
+  flutter_android_volume_keydown: # Needs gradle namespace
+    git:
+      url: https://github.com/Codel1417/flutter_android_volume_keydown
+      ref: feature/media_button
+
+  # Hive
+  hive: ^2.2.3
+  hive_flutter: ^1.1.0
+
+  # play services
+  in_app_review: ^2.0.9
+  upgrader: ^10.3.0
+
+  # Sentry
+  sentry_flutter: ^7.20.1
+  sentry_logging: ^7.20.0
+  sentry_hive: ^7.20.0
+  sentry_dio: ^7.20.0
+  feedback_sentry: ^3.0.0
+
 dev_dependencies:
   build_runner:
   flutter_test:
@@ -105,7 +120,6 @@ dev_dependencies:
   intl_translation:
   hive_generator: ^2.0.1
   icons_launcher: ^2.1.7
-  pretty_dio_logger: ^1.3.1
   integration_test:
     sdk: flutter
 flutter: