diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0b3013d..466e8ec 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -84,7 +84,7 @@ TARGET_LIBAGL_USE_GRALLOC_COPYBITS := true
 
 BOARD_NO_RGBX_8888 := true
 
-WITH_DEXPREOPT := true
+# WITH_DEXPREOPT := true
 JS_ENGINE := v8
 
 TARGET_RELEASETOOLS_EXTENSIONS := device/htc/common
diff --git a/click.mk b/click.mk
index af60641..378e7bf 100644
--- a/click.mk
+++ b/click.mk
@@ -33,7 +33,11 @@ PRODUCT_PACKAGES += \
     libOmxVidEnc \
     libcamera \
     librpc \
-    dhcpcd.conf
+    dhcpcd.conf \
+    rzscontrol \
+    dexpreopt
+
+DISABLE_DEXPREOPT := false
 
 #WiFi stuff
 PRODUCT_PACKAGES += \
@@ -84,8 +88,7 @@ PRODUCT_COPY_FILES += \
 
 # precompiled files for /system/bin
 PRODUCT_COPY_FILES += \
-    device/htc/click/custom/calibrate_screen:system/bin/calibrate_screen \
-    device/htc/click/custom/rzscontrol:system/bin/rzscontrol
+    device/htc/click/custom/calibrate_screen:system/bin/calibrate_screen
 
 # media configuration xml file
 PRODUCT_COPY_FILES += \
@@ -117,5 +120,3 @@ $(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/rzscontrol b/custom/rzscontrol
deleted file mode 100755
index cfb8af6..0000000
Binary files a/custom/rzscontrol and /dev/null differ
diff --git a/system.prop b/system.prop
index 31e0458..cb82123 100644
--- a/system.prop
+++ b/system.prop
@@ -7,6 +7,7 @@ ro.media.dec.jpeg.memcap=20000000
 
 # RIL specific configuration
 rild.libpath=/system/lib/libhtc_ril.so
+dalvik.vm.dexopt-flags=m=y
 ro.ril.ecc.HTC-ELL=92,93,94
 ro.ril.ecc.HTC-WWE=999
 ro.ril.enable.a52.HTC-ITA=1
@@ -27,7 +28,7 @@ ro.gsm.2nd_data_retry_config = max_retries=3, 2000, 2000, 2000
 # This only affects the case in which there are remembered access points,
 # but none are in range.
 wifi.interface = tiwlan0
-wifi.supplicant_scan_interval=45
+wifi.supplicant_scan_interval=120
 
 # density in DPI of the LCD of this board. This is used to scale the UI
 # appropriately. If this property is not defined, the default value is 120 dpi.