diff --git a/selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.cc b/selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.cc
index 3b1f1b64b9..1ebaf4f14e 100644
--- a/selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.cc
+++ b/selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.cc
@@ -45,10 +45,6 @@ SunnylinkPanel::SunnylinkPanel(QWidget* parent) : QFrame(parent) {
       sunnylinkEnabledBtn->setDescription(shame_description);
     }
 
-    //auto dialog_text = tr("A reboot is required to") + " " + (enabled ? tr("start") : tr("stop")) +" "+ tr("all connections and processes from sunnylink.") + "<br/><small>"+ tr("If that's not a problem for you, you can ignore this.")+ "</small>";
-    //if (ConfirmationDialog::confirm(dialog_text, tr("Reboot Now!"), this)) {
-    //  Hardware::reboot();
-    //}
     updateLabels();
   });
 
diff --git a/system/manager/manager.py b/system/manager/manager.py
index 7da65b55e1..f3269ee4c3 100755
--- a/system/manager/manager.py
+++ b/system/manager/manager.py
@@ -73,11 +73,9 @@ def manager_init() -> None:
     ("LastSpeedLimitSignTap", "0"),
     ("LkasToggle", "0"),
     ("MadsIconToggle", "1"),
-    ("MapboxFullScreen", "0"),
     ("MapdVersion", f"{VERSION}"),
     ("MaxTimeOffroad", "9"),
     ("NNFF", "0"),
-    ("NNFFNoLateralJerk", "0"),
     ("OnroadScreenOff", "-2"),
     ("OnroadScreenOffBrightness", "50"),
     ("OnroadScreenOffEvent", "1"),
@@ -98,7 +96,6 @@ def manager_init() -> None:
     ("StockLongToyota", "0"),
     ("TorqueDeadzoneDeg", "0"),
     ("TorqueFriction", "1"),
-    ("TorqueLateralJerk", "0"),
     ("TorqueMaxLatAccel", "250"),
     ("TrueVEgoUi", "0"),
     ("TurnSpeedControl", "0"),
@@ -109,7 +106,7 @@ def manager_init() -> None:
     ("OsmDownloadedDate", "0"),
     ("OSMDownloadProgress", "{}"),
     ("SidebarTemperatureOptions", "0"),
-    ("SunnylinkEnabled", "1"),
+    ("SunnylinkEnabled", "0" if (build_metadata.release_channel or build_metadata.release_sp_channel) else "1"),
     ("SunnylinkDongleId", f"{UNREGISTERED_SUNNYLINK_DONGLE_ID}"),
     ("CustomDrivingModel", "0"),
     ("DrivingModelGeneration", "4"),
diff --git a/system/manager/sunnylink.py b/system/manager/sunnylink.py
index 17384f14b8..9c396d25ea 100755
--- a/system/manager/sunnylink.py
+++ b/system/manager/sunnylink.py
@@ -11,7 +11,6 @@ def main():
 
   if not Params().get_bool("SunnylinkEnabled"):
     print("Sunnylink is not enabled. Exiting.")
-    # spinner.close()
     exit(0)
 
   if not is_prebuilt():