diff --git a/launch_chffrplus.sh b/launch_chffrplus.sh
index 137661be0e..4011eef7f2 100755
--- a/launch_chffrplus.sh
+++ b/launch_chffrplus.sh
@@ -4,8 +4,6 @@ if [ -z "$BASEDIR" ]; then
   BASEDIR="/data/openpilot"
 fi
 
-unset REQUIRED_NEOS_VERSION
-unset AGNOS_VERSION
 source "$BASEDIR/launch_env.sh"
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
diff --git a/selfdrive/tombstoned.py b/selfdrive/tombstoned.py
index 8d23ed022d..c17133224d 100755
--- a/selfdrive/tombstoned.py
+++ b/selfdrive/tombstoned.py
@@ -178,8 +178,7 @@ def report_tombstone_apport(fn, client):
 
 
 def main():
-  # TODO: turn on when all tombstones are recovered
-  # clear_apport_folder()  # Clear apport folder on start, otherwise duplicate crashes won't register
+  clear_apport_folder()  # Clear apport folder on start, otherwise duplicate crashes won't register
   initial_tombstones = set(get_tombstones())
 
   tags = {