diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
index 5a745b1..bf31fc9 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -56,13 +56,6 @@
 else
   mkdir $ARCHIVEDIR
 
-  rm -rf device/asus/tilapia
-  rm -rf device/lge
-  rm -rf device/moto
-  rm -rf device/samsung/manta
-  rm -rf device/samsung/crespo*
-  rm -rf hardware/qcom
-  rm -rf hardware/samsung_slsi
   . build/envsetup.sh
   for DEVICENAME in $DEVICES
   do
@@ -73,6 +66,22 @@
       cut -b 15- |
       sort -f > $ARCHIVEDIR/$DEVICENAME-with.txt
   done
+  rm -rf device/asus/tilapia
+  rm -rf device/lge
+  rm -rf device/moto
+  rm -rf device/samsung/manta
+  rm -rf device/samsung/crespo*
+  rm -rf device/samsung/toro*p*
+  rm -rf external/eigen
+  rm -rf external/libnfc-nci
+  rm -rf hardware/broadcom/nfc
+  rm -rf hardware/msm7k
+  rm -rf hardware/qcom
+  rm -rf hardware/samsung_slsi
+  rm -rf packages/apps/Camera
+  rm -rf packages/apps/Gallery2
+  rm -rf packages/apps/Nfc
+  rm -rf packages/apps/PhoneCommon
   rm -rf vendor
   for DEVICENAME in $DEVICES
   do