More cleanup

Change-Id: Ic60b4f611662a00eee40e13b7defdecb2b87abcf
diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
index 0881fdb..b871338 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -42,7 +42,7 @@
 fi
 shift
 
-DEVICES="panda maguro toro toroplus grouper tilapia mako manta"
+DEVICES="panda maguro toro grouper tilapia manta"
 export LC_ALL=C
 
 repo sync -j32 -n
@@ -56,8 +56,10 @@
 else
   mkdir $ARCHIVEDIR
 
-  rm -rf device/moto/common device/moto/stingray device/moto/wingray
-  rm -rf device/samsung/crespo device/samsung/crespo4g
+  rm -rf device/lge
+  rm -rf device/moto
+  rm -rf device/samsung/crespo*
+  rm -rf hardware/qcom
   . build/envsetup.sh
   for DEVICENAME in $DEVICES
   do
@@ -69,7 +71,6 @@
       sort -f > $ARCHIVEDIR/$DEVICENAME-with.txt
   done
   rm -rf vendor
-  rm -rf hardware/qcom/audio hardware/qcom/camera hardware/qcom/gps
   for DEVICENAME in $DEVICES
   do
     rm -rf out