diff --git a/BoardConfig.mk b/BoardConfig.mk
index 1e58f58..d9a403a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -71,8 +71,6 @@ BOARD_VENDOR_QCOM_AMSS_VERSION := 6355
 
 BOARD_USES_QCOM_HARDWARE := true
 
-BOARD_HAS_LIMITED_EGL := true
-
 TARGET_HARDWARE_3D := false
 
 # OpenGL drivers config file path
diff --git a/device_hero.mk b/device_hero.mk
index ec292c4..e029ce9 100644
--- a/device_hero.mk
+++ b/device_hero.mk
@@ -45,9 +45,6 @@ PRODUCT_PACKAGES += \
     libOmxVidEnc \
     libmm-omxcore
 
-#Gallery 2d
-PRODUCT_PACKAGES += Gallery
-
 # Install the features available on this device.
 PRODUCT_COPY_FILES += \
     frameworks/base/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
@@ -111,11 +108,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
     dalvik.vm.heapsize=24m \
     ro.compcache.default=0 \
     persist.sys.use_dithering=0 \
-    debug.sf.hw=1
 
 # OpenGL ES 1.1-CM
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.opengles.version = 165537 \
+    ro.opengles.version = 65536 \
+    debug.sf.hw=1 \
     ro.product.multi_touch_enabled=true
 
 # Default network type
@@ -137,9 +134,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.com.google.locationfeatures = 1 \
     ro.setupwizard.mode=OPTIONAL \
     ro.setupwizard.enable_bypass=1 \
-    ro.media.dec.aud.wma.enabled=1 \
-    ro.media.dec.vid.wmv.enabled=1 \
-    dalvik.vm.dexopt-flags=m=y \
     net.bt.name=Android \
     ro.config.sync=yes
 
diff --git a/extract-files.sh b/extract-files.sh
index 251ed87..3e21c43 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -44,8 +44,6 @@ adb pull /system/lib/libOmxH264Dec.so ../../../vendor/htc/$DEVICE/proprietary/li
 adb pull /system/lib/libOmxMpeg4Dec.so ../../../vendor/htc/$DEVICE/proprietary/libOmxMpeg4Dec.so
 adb pull /system/lib/libOmxVidEnc.so ../../../vendor/htc/$DEVICE/proprietary/libOmxVidEnc.so
 adb pull /system/lib/hw/lights.msm7k.so ../../../vendor/htc/$DEVICE/proprietary/lights.msm7k.so
-adb pull /system/lib/libomx_wmadec_sharedlibrary.so ../../../vendor/htc/$DEVICE/proprietary/libomx_wmadec_sharedlibrary.so
-adb pull /system/lib/libomx_wmvdec_sharedlibrary.so ../../../vendor/htc/$DEVICE/proprietary/libomx_wmvdec_sharedlibrary.so
 adb pull /system/lib/libpvasfcommon.so ../../../vendor/htc/$DEVICE/proprietary/libpvasfcommon.so
 adb pull /system/lib/libpvasflocalpbreg.so ../../../vendor/htc/$DEVICE/proprietary/libpvasflocalpbreg.so
 adb pull /system/lib/libpvasflocalpb.so ../../../vendor/htc/$DEVICE/proprietary/libpvasflocalpb.so
diff --git a/media_profiles.xml b/media_profiles.xml
index d683b1f..4d5d577 100644
--- a/media_profiles.xml
+++ b/media_profiles.xml
@@ -86,9 +86,9 @@
                    height="288"
                    frameRate="20" />
 
-            <Audio codec="amrnb"
-                   bitRate="12200"
-                   sampleRate="8000"
+            <Audio codec="aac"
+                   bitRate="96000"
+                   sampleRate="16000"
                    channels="1" />
         </EncoderProfile>
 
@@ -140,7 +140,11 @@
         minBitRate="5525" maxBitRate="12200"
         minSampleRate="8000" maxSampleRate="8000"
         minChannels="1" maxChannels="1" />
-
+    
+    <AudioEncoderCap name="aac" enabled="true"
+        minBitRate="8192" maxBitRate="96000"
+        minSampleRate="8000" maxSampleRate="16000"
+        minChannels="1" maxChannels="1" />
     <!--
         FIXME:
         We do not check decoder capabilities at present
@@ -148,6 +152,6 @@
         for TEST applications. For other applications, we do
         not perform any checks at all.
     -->
-    <VideoDecoderCap name="wmv" enabled="true"/>
-    <AudioDecoderCap name="wma" enabled="true"/>
+    <VideoDecoderCap name="wmv" enabled="false"/>
+    <AudioDecoderCap name="wma" enabled="false"/>
 </MediaSettings>
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 4a5efeb..598bff5 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -66,8 +66,6 @@ PRODUCT_COPY_FILES += \\
 
 ifdef WITH_WINDOWS_MEDIA
 PRODUCT_COPY_FILES += \\
-    vendor/htc/__DEVICE__/proprietary/libomx_wmadec_sharedlibrary.so:system/lib/libomx_wmadec_sharedlibrary.so \\
-    vendor/htc/__DEVICE__/proprietary/libomx_wmvdec_sharedlibrary.so:system/lib/libomx_wmvdec_sharedlibrary.so \\
     vendor/htc/__DEVICE__/proprietary/libpvasfcommon.so:system/lib/libpvasfcommon.so \\
     vendor/htc/__DEVICE__/proprietary/libpvasflocalpbreg.so:system/lib/libpvasflocalpbreg.so \\
     vendor/htc/__DEVICE__/proprietary/libpvasflocalpb.so:system/lib/libpvasflocalpb.so \\
diff --git a/unzip-files.sh b/unzip-files.sh
index 7a61bb8..999ca77 100755
--- a/unzip-files.sh
+++ b/unzip-files.sh
@@ -46,8 +46,6 @@ unzip -j -o ../../../${DEVICE}_update.zip -d ../../../vendor/htc/$DEVICE/proprie
 	 system/lib/libOmxMpeg4Dec.so \
 	 system/lib/libOmxVidEnc.so \
 	 system/lib/hw/lights.msm7k.so \
-		system/lib/libomx_wmadec_sharedlibrary.so \
-		system/lib/libomx_wmvdec_sharedlibrary.so \
 		system/lib/libpvasfcommon.so \
 		system/lib/libpvasflocalpbreg.so \
 		system/lib/libpvasflocalpb.so \