diff --git a/overlay/common/frameworks/base/packages/Keyguard/res/values-sw600dp/bools.xml b/overlay/common/frameworks/base/packages/Keyguard/res/values-sw600dp/bools.xml
deleted file mode 100644
index a29beec0..00000000
--- a/overlay/common/frameworks/base/packages/Keyguard/res/values-sw600dp/bools.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<resources>
-    <!-- No camera for you, tablet user -->
-    <bool name="kg_enable_camera_default_widget">true</bool>
-</resources>
diff --git a/overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml b/overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml
index 99b5dab1..285767af 100644
--- a/overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml
+++ b/overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml
@@ -15,17 +15,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Package name for default keyguard appwidget [DO NOT TRANSLATE] -->
-    <string name="widget_default_package_name">com.cyanogenmod.lockclock</string>
-
-    <!-- Class name for default keyguard appwidget [DO NOT TRANSLATE] -->
-    <string name="widget_default_class_name">com.cyanogenmod.lockclock.ClockWidgetProvider</string>
-
     <!-- default to disabling the menu key. The CM setting to
          do this is a no-op unless the below item is true -->
     <bool name="config_disableMenuKeyInLockScreen">true</bool>
 
     <!-- config for showing AM/PM on lock screen in 12hour format -->
     <bool name="config_showAmpm">false</bool>
-
 </resources>
diff --git a/overlay/common/packages/apps/Mms/res/xml-mcc440-mnc20/mms_config.xml b/overlay/common/packages/apps/Mms/res/xml-mcc440-mnc20/mms_config.xml
deleted file mode 100644
index 60c1a489..00000000
--- a/overlay/common/packages/apps/Mms/res/xml-mcc440-mnc20/mms_config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 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.
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<mms_config version="4">
-    <!-- SoftBank maintains a MMS UserAgent whitelist, we must use one of the white-listed strings to be able to send/receive -->
-    <string name="userAgent">Nexus5</string>
-    <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
-</mms_config>
diff --git a/overlay/common/packages/services/Telecomm/res/values/cm_config.xml b/overlay/common/packages/services/Telecomm/res/values/cm_config.xml
deleted file mode 100644
index 958422be..00000000
--- a/overlay/common/packages/services/Telecomm/res/values/cm_config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The CyanogenMod 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.
--->
-
-<resources>
-    <!-- Class name for the default in-call UI Service [DO NOT TRANSLATE] -->
-    <string-array name="incall_default_classes" translatable="false">
-        <item>com.android.dialer/com.android.incallui.InCallServiceImpl</item>
-    </string-array>
-
-    <!-- Class name for the default main dialer activity [DO NOT TRANSLATE] -->
-    <string-array name="dialer_default_classes" translatable="false">
-        <item>com.android.dialer/com.android.dialer.DialtactsActivity</item>
-    </string-array>
-</resources>
diff --git a/overlay/common/packages/services/Telephony/res/values/cm_config.xml b/overlay/common/packages/services/Telephony/res/values/cm_config.xml
deleted file mode 100644
index cc13e494..00000000
--- a/overlay/common/packages/services/Telephony/res/values/cm_config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The CyanogenMod 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.
--->
-
-<resources>
-  <string-array name="dialer_default_classes" translatable="false">
-      <item>com.android.dialer/com.android.dialer.DialtactsActivity</item>
-  </string-array>
-</resources>