diff --git a/apns-conf.xml b/apns-conf.xml
deleted file mode 100755
index 3d451b4..0000000
--- a/apns-conf.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- This file contains fake APNs that are necessary for the emulator
-     to talk to the network.  It should only be installed for SDK builds.
-
-     This file is not installed by the local Android.mk, it's installed using
-     a PRODUCT_COPY_FILES line in the sdk section of the toplevel Makefile.
--->
-<apns version="7">
-    <apn carrier="Sprint"
-         mcc="310"
-         mnc="120"
-         apn="Sprint"
-         user="Sprint"
-         server="*"
-         password="*"
-         mmsc="http://mms.sprintpcs.com"
-         authtype="3"
-    />
-</apns>
diff --git a/apns.xml b/apns.xml
deleted file mode 100644
index 4d99658..0000000
--- a/apns.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<apns version="8">
-    <apn carrier="Production" apn="1" mmsc="http://mms.sprintpcs.com" mmsproxy="68.28.31.7" mmsport="80" mmsprotocol="2.0" mcc="000" mnc="00" type="mms" />
-</apns>
diff --git a/jewel.mk b/jewel.mk
index d660e96..29107e0 100644
--- a/jewel.mk
+++ b/jewel.mk
@@ -61,10 +61,11 @@
 # QC thermald config
 PRODUCT_COPY_FILES += device/htc/jewel/configs/thermald.conf:system/etc/thermald.conf
 
-# vold config
+# vold and apns config
 PRODUCT_COPY_FILES += \
-    device/htc/jewel/configs/vold.fstab:system/etc/vold.fstab \
-    device/htc/jewel/apns-conf.xml:system/etc/apns-conf.xml
+    device/htc/jewel/configs/vold.fstab:system/etc/vold.fstab
+#    device/htc/jewel/apns.xml:system/etc/apns.xml
+#    device/htc/jewel/apns-conf.xml:system/etc/apns-conf.xml
 
 # wifi config
 PRODUCT_COPY_FILES += \
diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
index 814c258..d7e790a 100644
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
@@ -2,5 +2,6 @@
 <StorageList
   xmlns:android="http://schemas.android.com/apk/res/android">
     <storage android:mountPoint="/mnt/sdcard/ext_sd" android:storageDescription="@string/storage_sd_card" android:primary="false" android:removable="true" />
+    <storage android:mountPoint="/mnt/sdcard/usb" android:storageDescription="@string/storage_usb" android:primary="false" android:removable="true" />
     <storage android:mountPoint="/mnt/sdcard" android:storageDescription="@string/storage_internal" android:primary="true" android:removable="false" />
 </StorageList>
diff --git a/overlay/packages/apps/Mms/res/xml/mms_config.xml b/overlay/packages/apps/Mms/res/xml/mms_config.xml
deleted file mode 100755
index 0e1f416..0000000
--- a/overlay/packages/apps/Mms/res/xml/mms_config.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">307200</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1000</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">1296</int>
-
-    <!-- User-Agent parameter used in MMS http request -->
-    <string name="userAgent">Sprint APX515CKT Build/GRH78C</string>
-
-    <!-- UAProf URL -->
-    <string name="uaProfUrl">http://device.sprintpcs.com/HTC/APX515CKT/0876513.rdf</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">-1</int>
-
-    <!-- Maximum number of SMS message segments in a long text message before converting
-         the SMS message to an MMS message. -->
-    <int name="smsToMmsTextThreshold">4</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-</mms_config>
diff --git a/system.prop b/system.prop
index 9124163..4dde50a 100644
--- a/system.prop
+++ b/system.prop
@@ -15,110 +15,6 @@
 rild.libargs=-d /dev/smd0
 ro.vendor.extension_library=/system/lib/libqc-opt.so
 ro.baseband.arch=msm
-rild.libpath=/system/lib/libril-qc-qmi-1.so
-rild.libargs=-d /dev/smd0
-persist.rild.nitz_plmn=
-persist.rild.nitz_long_ons_0=
-persist.rild.nitz_long_ons_1=
-persist.rild.nitz_long_ons_2=
-persist.rild.nitz_long_ons_3=
-persist.rild.nitz_short_ons_0=
-persist.rild.nitz_short_ons_1=
-persist.rild.nitz_short_ons_2=
-persist.rild.nitz_short_ons_3=
-persist.rild.ril.ltedr=0
-persist.rild.ril.ltedrtable=max_retries=infinite,10000
-ril.subscription.types=NV,RUIM
-DEVICE_PROVISIONED=1
-debug.sf.hw=1
-debug.egl.hw=1
-debug.composition.type=dyn
-ro.cdma.home.operator.alpha=Sprint
-gsm.sim.operator.alpha=Sprint
-gsm.operator.alpha=Sprint
-ro.cdma.home.operator.numeric=310120
-gsm.sim.operator.numeric=310120
-gsm.operator.numeric=310120
-gsm.sim.operator.iso-country=us
-gsm.operator.iso-country=us
-ro.net.apnwhitelist=admin
-ro.htc.checkin.delay=0
-ro.da1.enable=true
-ro.watch.appid=com.sdgtl.watch.jelcl_40_ics
-ro.telephony.ipv6_capability=1
-
-# system props for the cne module
-#
-persist.cne.UseCne=false
-persist.cne.bat.range.low.med=30
-persist.cne.bat.range.med.high=60
-persist.cne.loc.policy.op=/system/etc/OperatorPolicy.xml
-persist.cne.loc.policy.user=/system/etc/UserPolicy.xml
-persist.cne.bwbased.rat.sel=false
-persist.cne.snsr.based.rat.mgt=false
-persist.cne.bat.based.rat.mgt=false
-persist.cne.be.ge.sqi.min=0
-persist.cne.be.ge.sqi.max=100
-persist.cne.be.umts.sqi.min=0
-persist.cne.be.umts.sqi.max=100
-persist.cne.be.hspa.sqi.min=0
-persist.cne.be.hspa.sqi.max=100
-persist.cne.be.1x.sqi.min=0
-persist.cne.be.1x.sqi.max=100
-persist.cne.be.do.sqi.min=0
-persist.cne.be.do.sqi.max=100
-persist.cne.be.wlan.sqi.min=0
-persist.cne.be.wlan.sqi.max=100
-ro.hdmi.enable=true
-lpa.decode=true
-lpa.tunnel=true
-lpa.use-stagefright=true
-htc.audio.lpa.a2dp=0
-htc.audio.global.state=0
-htc.audio.global.profile=0
-htc.audio.q6.topology=0
-htc.audio.enable_dmic=1
-
-# system props for the data modules
-#
-ro.use_data_netmgrd=true
-persist.data_netmgrd_mtu=1428
-#
-# system props for telephony modules
-#
-#device supports LTE
-ro.config.lte=true
-#device supports EHRPD
-#ro.config.ehrpd=true
-#device supports simultaneous 1x voice + LTE
-ro.config.svlte1x=true
- 
-# For Verizon data retry configuration
-ro.cdma.data_retry_config = max_retries=infinite,0,0,60000,120000,480000,900000
- 
-# Modify MMS APN retry timer from 5s to 2s.
-ro.gsm.2nd_data_retry_config = max_retries=3, 2000, 2000, 2000
- 
-# RF team request
-ro.ril.enable.dtm = 0
-ro.ril.gprsclass = 12
-ro.ril.hsdpa.category = 10
-ro.ril.hsupa.category = 6
-ro.ril.hsxpa = 3
- 
-# For the default value of agps
-ro.ril.def.agps.mode = 6
- 
-# For HSDPA low throughput
-ro.ril.disable.power.collapse = 1
- 
-#system props for time-services
-persist.timed.enable=true
- 
-# System props for audio
-persist.audio.fluence.mode=endfire
-persist.audio.vr.enable=false
-persist.audio.handset.mic=analog
 
 # For the default value of agps
 ro.ril.def.agps.mode = 6
@@ -129,7 +25,6 @@
 # graphics
 debug.composition.type=dyn
 debug.enabletr=true
-debug.qctwa.preservebuf=1
 debug.sf.hw=1
 ro.opengles.version=131072
 ro.sf.compbypass.enable=1