diff --git a/selfdrive/test/setup_device_ci.sh b/selfdrive/test/setup_device_ci.sh
index 1b518ddb21..72f5fff28b 100755
--- a/selfdrive/test/setup_device_ci.sh
+++ b/selfdrive/test/setup_device_ci.sh
@@ -19,6 +19,7 @@ fi
 
 umount /data/safe_staging/merged/ || true
 sudo umount /data/safe_staging/merged/ || true
+rm -rf /data/safe_staging/* || true
 
 export KEYS_PARAM_PATH="/data/params/d/GithubSshKeys"
 export KEYS_PATH="/usr/comma/setup_keys"
@@ -54,7 +55,6 @@ cd $SOURCE_DIR
 
 rm -f .git/index.lock
 git reset --hard
-git fetch
 find . -maxdepth 1 -not -path './.git' -not -name '.' -not -name '..' -exec rm -rf '{}' \;
 git fetch --verbose origin $GIT_COMMIT
 git reset --hard $GIT_COMMIT
@@ -63,6 +63,8 @@ git clean -xdf
 git submodule update --init --recursive
 git submodule foreach --recursive "git reset --hard && git clean -xdf"
 
+git lfs prune
+
 echo "git checkout done, t=$SECONDS"
 
 rsync -a --delete $SOURCE_DIR $TEST_DIR