diff --git a/click.mk b/click.mk
index 920ebaa..af60641 100644
--- a/click.mk
+++ b/click.mk
@@ -84,9 +84,7 @@ PRODUCT_COPY_FILES += \
 
 # precompiled files for /system/bin
 PRODUCT_COPY_FILES += \
-    device/htc/click/custom/compcache:system/bin/compcache \
     device/htc/click/custom/calibrate_screen:system/bin/calibrate_screen \
-    device/htc/click/custom/handle_compcache:system/bin/handle_compcache \
     device/htc/click/custom/rzscontrol:system/bin/rzscontrol
 
 # media configuration xml file
@@ -119,3 +117,5 @@ $(call inherit-product-if-exists, vendor/htc/click/click-vendor.mk)
 
 # Added all the kernel modules to be copyed
 $(call inherit-product-if-exists, device/htc/click/KernelModules.mk)
+
+PRODUCT_LOCALES += ldpi,mdpi
diff --git a/custom/compcache b/custom/compcache
deleted file mode 100755
index f41e632..0000000
--- a/custom/compcache
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/system/bin/sh
-#
-# Compcache manager
-# shade@chemlab.org (cyanogen)
-#
-
-DEV=/dev/block/ramzswap0
-MODULE=ramzswap
-MODULES_DIR=/system/lib/modules/`uname -r`
-
-case "$1" in
-   start)
-      echo 3 > /proc/sys/vm/drop_caches
-      echo 30 > /proc/sys/vm/swappiness
-      modprobe $MODULE
-      rzscontrol $DEV --disksize_kb=$2 --init
-      swapon $DEV
-   ;;
-
-   stop)
-      swapoff $DEV >/dev/null 2>&1
-      rmmod $MODULE >/dev/null 2>&1
-   ;;
-   stats)
-      rzscontrol $DEV --stats
-   ;;
-   *)
-      echo "Usage: $0 {start <size>|stop|stats}"
-      exit 1
-esac
-
-exit 0
-
diff --git a/custom/handle_compcache b/custom/handle_compcache
deleted file mode 100644
index 44ab0b7..0000000
--- a/custom/handle_compcache
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/system/bin/sh
-#
-# Compcache handler
-# Decides whether or not Compcache is enabled
-#
-MEMTOTAL=$( awk '{ if ($1 eq "MemTotal:") print $2 ;exit }' </proc/meminfo )
-
-if [ `getprop persist.service.compcache` == 1 ];
-then
-  PROP=`getprop ro.compcache.default`
-  setprop persist.service.compcache $PROP
-fi
-
-if [ -e /data/property/persist.service.compcache ];
-then
-  PROP=`getprop persist.service.compcache`
-else
-  PROP=`getprop ro.compcache.default`
-  setprop persist.service.compcache $PROP
-fi
-
-if [ $PROP != 0 ]
-then
-  CCSIZE=$(($(($MEMTOTAL * $PROP)) / 100))
-  `dirname $0`/compcache start $CCSIZE
-else
-  `dirname $0`/compcache stop
-fi
-
-exit 0
-
diff --git a/custom/logo.rle b/custom/logo.rle
deleted file mode 100644
index 13851d1..0000000
Binary files a/custom/logo.rle and /dev/null differ
diff --git a/extract-files.sh b/extract-files.sh
index b2848df..d27051a 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -25,11 +25,8 @@ adb pull /system/app/HTCCalibrate.apk ../../../vendor/$MANUFACTURER/$DEVICE/prop
 adb pull /system/etc/AudioPara4.csv ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/AudioPara4.csv
 adb pull /system/etc/AudioFilter.csv ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/AudioFilter.csv
 adb pull /system/etc/AudioPreProcess.csv ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/AudioPreProcess.csv
-adb pull /system/lib/libmmcamera.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libmmcamera.so
 adb pull /system/lib/libmm-qcamera-tgt.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libmm-qcamera-tgt.so
-adb pull /system/lib/libmmjpeg.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libmmjpeg.so
 adb pull /system/lib/libaudioeq.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libaudioeq.so
-adb pull /system/lib/libqcamera.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libqcamera.so
 adb pull /system/lib/libmm-adspsvc.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libmm-adspsvc.so
 adb pull /system/lib/libgps.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libgps.so
 adb pull /system/lib/libOmxH264Dec.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libOmxH264Dec.so
@@ -76,11 +73,8 @@ PRODUCT_COPY_FILES += \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/AudioPara4.csv:system/etc/AudioPara4.csv \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/AudioFilter.csv:system/etc/AudioFilter.csv \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/AudioPreProcess.csv:system/etc/AudioPreProcess.csv \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libmmcamera.so:system/lib/libmmcamera.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libmm-qcamera-tgt.so:system/lib/libmm-qcamera-tgt.so \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libmmjpeg.so:system/lib/libmmjpeg.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libaudioeq.so:system/lib/libaudioeq.so \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libqcamera.so:system/lib/libqcamera.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libmm-adspsvc.so:system/lib/libmm-adspsvc.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libgps.so:system/lib/libgps.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libOmxH264Dec.so:system/lib/libOmxH264Dec.so \\
diff --git a/media_profiles.xml b/media_profiles.xml
index 79fb18b..8d0e32f 100644
--- a/media_profiles.xml
+++ b/media_profiles.xml
@@ -79,19 +79,6 @@
     <!-- Each camcorder profile defines a set of predefined configuration parameters -->
     <CamcorderProfiles cameraId="0">
 
-        <EncoderProfile quality="hd" fileFormat="mp4" duration="60">
-            <Video codec="m4v"
-                   bitRate="360000"
-                   width="352"
-                   height="288"
-                   frameRate="30" />
-
-            <Audio codec="aac"
-                    bitRate="64000"
-                    sampleRate="16000"
-                    channels="1" />
-        </EncoderProfile>
-
         <EncoderProfile quality="high" fileFormat="mp4" duration="60">
             <Video codec="h263"
                    bitRate="360000"
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index db75b66..33fc859 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -92,4 +92,7 @@
     <!-- Configure Top Rotary Possition-->
     <integer name="config_rotaryMarginBottomDIP">37</integer>
 
+    <!-- Configure lense unlock time label offset -->
+    <integer name="config_lenseTimeLabelOffsetDIP">30</integer>
+
 </resources>
diff --git a/system.prop b/system.prop
index f20a293..31e0458 100644
--- a/system.prop
+++ b/system.prop
@@ -70,3 +70,7 @@ pref_lock_home=1
 
 # Default Tether Dissabled
 ro.tether.denied=true
+
+# Enable Google-specific location features,
+# like NetworkLocationProvider and LocationCollector.
+ro.com.google.locationfeatures=1