diff --git a/RM.js b/RM.js
deleted file mode 100644
index b063e80..0000000
--- a/RM.js
+++ /dev/null
@@ -1,267 +0,0 @@
-{
- "version": 1,
- "homepage": "http://www.cyanogenmod.com/",
- "donate": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3283920",
- "roms": [
- {
-  "modversion": "CyanogenMod-7-05202011-NIGHTLY-Leo",
-  "incremental": "20110520",
-  "name": "CM7 - Build #20110520",
-  "urls": ["http://cmleonightly1.co.cc/rom/cm_leo_full-20110520.zip"],
-  "device": "leo",
-  "addons": [{
-    "name": "Google Apps",
-    "urls": ["http://goo-inside.me/gapps/gapps-gb-20110307-signed.zip"]
-   },
-   {
-    "name": "cLK patch",
-    "urls": ["http://cmleonightly1.co.cc/cLK/charan_05152011_cLK_ppp_cache.zip"]
-   },
-   {
-    "name": "3rd Party",
-    "urls": ["http://cmleonightly1.co.cc/misc/3rdParty-20110517.zip"]
-   }
-   ],
-   "choices": [{
-     "name": "Kernel",
-     "options": [{
-       "name": "Main (charans)",
-       "url": ""
-     },
-     {
-       "name": "tytung r10",
-       "url": "http://cmleonightly1.co.cc/kernels/tytung_r10_charan_clk.zip"
-     },
-     {
-       "name": "rafpigna 1r9",
-       "url": "http://cmleonightly1.co.cc/kernels/rafpigna_1r9_charan_clk.zip"
-     }]
-    }],
-   "product": "CyanogenModLeoNightly",
-   "summary": "05-20-2011"
-  },
- {
-  "modversion": "CyanogenMod-7-05192011-NIGHTLY-Leo",
-  "incremental": "20110519",
-  "name": "CM7 - Build #20110519",
-  "urls": ["http://cmleonightly1.co.cc/rom/cm_leo_full-20110519.zip"],
-  "device": "leo",
-  "addons": [{
-    "name": "Google Apps",
-    "urls": ["http://goo-inside.me/gapps/gapps-gb-20110307-signed.zip"]
-   },
-   {
-    "name": "cLK patch",
-    "urls": ["http://cmleonightly1.co.cc/cLK/charan_05152011_cLK_ppp_cache.zip"]
-   },
-   {
-    "name": "3rd Party",
-    "urls": ["http://cmleonightly1.co.cc/misc/3rdParty-20110517.zip"]
-   }
-   ],
-   "choices": [{
-     "name": "Kernel",
-     "options": [{
-       "name": "Main (charans)",
-       "url": ""
-     },
-     {
-       "name": "tytung r10",
-       "url": "http://cmleonightly1.co.cc/kernels/tytung_r10_charan_clk.zip"
-     },
-     {
-       "name": "rafpigna 1r9",
-       "url": "http://cmleonightly1.co.cc/kernels/rafpigna_1r9_charan_clk.zip"
-     }]
-    }],
-   "product": "CyanogenModLeoNightly",
-   "summary": "05-19-2011"
-  },
- {
-  "modversion": "CyanogenMod-7-05182011-NIGHTLY-Leo",
-  "incremental": "20110518",
-  "name": "CM7 - Build #20110518",
-  "urls": ["http://cmleonightly1.co.cc/rom/cm_leo_full-20110518.zip"],
-  "device": "leo",
-  "addons": [{
-    "name": "Google Apps",
-    "urls": ["http://goo-inside.me/gapps/gapps-gb-20110307-signed.zip"]
-   },
-   {
-    "name": "cLK patch",
-    "urls": ["http://cmleonightly1.co.cc/cLK/charan_05152011_cLK_ppp_cache.zip"]
-   },
-   {
-    "name": "3rd Party",
-    "urls": ["http://cmleonightly1.co.cc/misc/3rdParty-20110517.zip"]
-   }
-   ],
-   "choices": [{
-     "name": "Kernel",
-     "options": [{
-       "name": "Main (charans)",
-       "url": ""
-     },
-     {
-       "name": "tytung r10",
-       "url": "http://cmleonightly1.co.cc/kernels/tytung_r10_charan_clk.zip"
-     }]
-    }],
-   "product": "CyanogenModLeoNightly",
-   "summary": "05-18-2011"
-  },
- {
-  "modversion": "CyanogenMod-7-05172011-NIGHTLY-Leo",
-  "incremental": "20110517",
-  "name": "CM7 - Build #20110517",
-  "urls": ["http://cmleonightly1.co.cc/rom/cm_leo_full-20110517.zip"],
-  "device": "leo",
-  "addons": [{
-    "name": "Google Apps",
-    "urls": ["http://goo-inside.me/gapps/gapps-gb-20110307-signed.zip"]
-   },
-   {
-    "name": "cLK patch",
-    "urls": ["http://cmleonightly1.co.cc/cLK/charan_05152011_cLK_ppp_cache.zip"]
-   },
-   {
-    "name": "3rd Party",
-    "urls": ["http://cmleonightly1.co.cc/misc/3rdParty-20110517.zip"]
-   }
-   ],
-   "choices": [{
-     "name": "Kernel",
-     "options": [{
-       "name": "Main (charans)",
-       "url": ""
-     },
-     {
-       "name": "tytung r10",
-       "url": "http://cmleonightly1.co.cc/kernels/tytung_r10_charan_clk.zip"
-     }]
-    }],
-   "product": "CyanogenModLeoNightly",
-   "summary": "05-17-2011"
-  },
- {
-  "modversion": "CyanogenMod-7-05162011-NIGHTLY-Leo",
-  "incremental": "20110516",
-  "name": "CM7 - Build #20110516",
-  "urls": ["http://cmleonightly1.co.cc/rom/cm_leo_full-20110516.zip"],
-  "device": "leo",
-  "addons": [{
-    "name": "Google Apps",
-    "urls": ["http://goo-inside.me/gapps/gapps-gb-20110307-signed.zip"]
-   },
-   {
-    "name": "cLK patch",
-    "urls": ["http://cmleonightly1.co.cc/cLK/charan_05152011_cLK_ppp_cache.zip"]
-   },
-   {
-    "name": "3rd Party",
-    "urls": ["http://cmleonightly1.co.cc/misc/3rdParty-20110517.zip"]
-   }
-   ],
-   "product": "CyanogenModLeoNightly",
-   "summary": "05-16-2011"
-  },
- {
-  "modversion": "CyanogenMod-7-05152011-NIGHTLY-Leo",
-  "incremental": "20110515",
-  "name": "CM7 - Build #20110515",
-  "urls": ["http://cmleonightly1.co.cc/rom/cm_leo_full-20110515.zip"],
-  "device": "leo",
-  "addons": [{
-    "name": "Google Apps",
-    "urls": ["http://goo-inside.me/gapps/gapps-gb-20110307-signed.zip"]
-   },
-   {
-    "name": "cLK patch",
-    "urls": ["http://cmleonightly1.co.cc/cLK/charan_05152011_cLK_ppp_cache.zip"]
-   },
-   {
-    "name": "3rd Party",
-    "urls": ["http://cmleonightly1.co.cc/misc/3rdParty-20110517.zip"]
-   }
-   ],
-   "choices": [{
-     "name": "Kernel",
-     "options": [{
-       "name": "Main (charans)",
-       "url": ""
-     },
-     {
-       "name": "tytung r10",
-       "url": "http://cmleonightly1.co.cc/kernels/tytung_r10_charan_clk.zip"
-     }]
-    }],
-   "product": "CyanogenModLeoNightly",
-   "summary": "05-15-2011"
-  },
- {
-  "modversion": "CyanogenMod-7-05142011-NIGHTLY-Leo",
-  "incremental": "20110514",
-  "name": "CM7 - Build #20110514",
-  "urls": ["http://cmleonightly1.co.cc/rom/cm_leo_full-20110514.zip"],
-  "device": "leo",
-  "addons": [{
-    "name": "Google Apps",
-    "urls": ["http://goo-inside.me/gapps/gapps-gb-20110307-signed.zip"]
-   },
-   {
-    "name": "cLK patch",
-    "urls": ["http://cmleonightly1.co.cc/cLK/charan_05142011_cLK_ppp_cache.zip"]
-   },
-   {
-    "name": "3rd Party",
-    "urls": ["http://cmleonightly1.co.cc/misc/3rdParty-20110517.zip"]
-   }
-   ],
-   "choices": [{
-     "name": "Kernel",
-     "options": [{
-       "name": "Main (charans)",
-       "url": ""
-     },
-     {
-       "name": "tytung r10",
-       "url": "http://cmleonightly1.co.cc/kernels/tytung_r10_charan_clk.zip"
-     }]
-    }],
-   "product": "CyanogenModLeoNightly",
-   "summary": "05-14-2011"
-  },
- {
-  "modversion": "CyanogenMod-7-05132011-NIGHTLY-Leo",
-  "incremental": "20110513",
-  "name": "CM7 - Build #20110513",
-  "urls": ["http://cmleonightly1.co.cc/rom/cm_leo_full-20110513.zip"],
-  "device": "leo",
-  "addons": [{
-    "name": "Google Apps",
-    "urls": ["http://goo-inside.me/gapps/gapps-gb-20110307-signed.zip"]
-   },
-   {
-    "name": "cLK patch",
-    "urls": ["http://cmleonightly1.co.cc/cLK/charan_05112011_cLK_ppp_cache.zip"]
-   },
-   {
-    "name": "3rd Party",
-    "urls": ["http://cmleonightly1.co.cc/misc/3rdParty-20110517.zip"]
-   }
-   ],
-   "choices": [{
-     "name": "Kernel",
-     "options": [{
-       "name": "Main (charans)",
-       "url": ""
-     },
-     {
-       "name": "tytung r10",
-       "url": "http://cmleonightly1.co.cc/kernels/tytung_r10_charan_clk.zip"
-     }]
-    }],
-   "product": "CyanogenModLeoNightly",
-   "summary": "05-13-2011"
-  }
-]}
diff --git a/extract-files.sh b/extract-files.sh
index 5498ca0..8b31d5f 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -43,14 +43,11 @@ adb pull /system/lib/libcamera.so ../../../vendor/$MANUFACTURER/$DEVICE/propriet
 adb pull /system/lib/libgsl.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libgsl.so
 adb pull /system/lib/libhtc_acoustic.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libhtc_acoustic.so
 adb pull /system/lib/libhtc_ril.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libhtc_ril.so
-adb pull /system/lib/libhtc_ril_wrapper.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libhtc_ril_wrapper.so
 adb pull /system/lib/liboemcamera.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/liboemcamera.so
 adb pull /system/lib/libOmxVdec.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libOmxVdec.so
 adb pull /system/lib/libOmxVidEnc.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libOmxVidEnc.so
 adb pull /system/lib/libOmxCore.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libOmxCore.so
 adb pull /system/lib/libmm-omxcore.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libmm-omxcore.so
-adb pull /system/lib/libgps.so ..h/../../vendor/$MANUFACTURER/$DEVICE/proprietary/libgps.so
-adb pull /system/lib/hw/gps.htcleo.so ..h/../../vendor/$MANUFACTURER/$DEVICE/proprietary/gps.htcleo.so
 
 (cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$DEVICE/device-vendor-blobs.mk
 # Copyright (C) 2010 The Android Open Source Project
@@ -97,13 +94,10 @@ vendor/__MANUFACTURER__/__DEVICE__/proprietary/htcleo.acdb:system/etc/firmware/h
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libgsl.so:system/lib/libgsl.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libhtc_acoustic.so:system/lib/libhtc_acoustic.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libhtc_ril.so:system/lib/libhtc_ril.so \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libhtc_ril_wrapper.so:system/lib/libhtc_ril_wrapper.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/liboemcamera.so:system/lib/liboemcamera.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libOmxVdec.so:system/lib/libOmxVdec.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libOmxVidEnc.so:system/lib/libOmxVidEnc.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libOmxCore.so:system/lib/libOmxCore.so \\
-vendor/__MANUFACTURER__/__DEVICE__/proprietary/gps.htcleo.so:system/lib/hw/gps.htcleo.so \\
-vendor/__MANUFACTURER__/__DEVICE__/proprietary/libgps.so:system/lib/libgps.so \\
 vendor/__MANUFACTURER__/__DEVICE__/proprietary/sensors.bravo.so:system/lib/hw/sensors.bravo.so \\
 EOF