stop pulling in passion overlay and misc cleanup
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
index 01427de..c5d9dee 100644
--- a/products/cyanogen_liberty.mk
+++ b/products/cyanogen_liberty.mk
@@ -23,17 +23,9 @@
 # Build kernel
 PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/liberty/kernel
 
-# Extra Passion overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/passion
-
-# Extra RIL settings
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ril.enable.managed.roaming=1 \
-    ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
-    ro.ril.emc.mode=2
 
 # Enable Windows Media
-# WITH_WINDOWS_MEDIA := true
+WITH_WINDOWS_MEDIA := true
 
 #
 # Set ro.modversion