diff --git a/SConstruct b/SConstruct
index 035daee4..91c7186d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -330,12 +330,8 @@ if GetOption("clazy"):
   qt_env['CXX'] = 'clazy'
   qt_env['ENV']['CLAZY_IGNORE_DIRS'] = qt_dirs[0]
   qt_env['ENV']['CLAZY_CHECKS'] = ','.join(checks)
-Export('qt_env')
 
-
-# still needed for apks
-zmq = 'zmq'
-Export('env', 'arch', 'real_arch', 'zmq', 'SHARED', 'USE_WEBCAM', 'QCOM_REPLAY')
+Export('env', 'qt_env', 'arch', 'real_arch', 'SHARED', 'USE_WEBCAM', 'QCOM_REPLAY')
 
 # cereal and messaging are shared with the system
 SConscript(['cereal/SConscript'])
diff --git a/cereal b/cereal
index c803eddb..7d304cdd 160000
--- a/cereal
+++ b/cereal
@@ -1 +1 @@
-Subproject commit c803eddb33c05ac8e8704df90bf854e3dda600b3
+Subproject commit 7d304cdd296cb90bc15ded22bc50556780ccef51
diff --git a/selfdrive/debug/cpu_usage_stat.py b/selfdrive/debug/cpu_usage_stat.py
index fa7c266c..ffff3d6c 100755
--- a/selfdrive/debug/cpu_usage_stat.py
+++ b/selfdrive/debug/cpu_usage_stat.py
@@ -31,9 +31,6 @@ PRINT_INTERVAL = 5
 SLEEP_INTERVAL = 0.2
 
 monitored_proc_names = [
-  # offroad APK
-  'ai.comma.plus.offroad',
-
   # android procs
   'SurfaceFlinger', 'sensors.qcom'
 ] + list(managed_processes.keys())
diff --git a/selfdrive/manager/manager.py b/selfdrive/manager/manager.py
index 7839b282..84c3ae80 100755
--- a/selfdrive/manager/manager.py
+++ b/selfdrive/manager/manager.py
@@ -133,6 +133,7 @@ def manager_thread():
     msg.managerState.processes = [p.get_process_state_msg() for p in managed_processes.values()]
     pm.send('managerState', msg)
 
+    # TODO: let UI handle this
     # Exit main loop when uninstall is needed
     if params.get_bool("DoUninstall"):
       break
@@ -143,7 +144,7 @@ def main():
 
   manager_init()
 
-  # Start ui early so prepare can happen in the background
+  # Start UI early so prepare can happen in the background
   if not prepare_only:
     managed_processes['ui'].start()