diff --git a/cm.mk b/cm.mk
deleted file mode 100644
index 1f17984..0000000
--- a/cm.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-$(call inherit-product, device/lge/w7/full_w7.mk)
-
-# Inherit some common CM stuff.
-$(call inherit-product, vendor/cm/config/common_full_phone.mk)
-
-# Enhanced NFC
-$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
-
-# Boot animation
-TARGET_SCREEN_WIDTH := 540
-TARGET_SCREEN_HEIGHT := 960
-TARGET_BOOTANIMATION_HALF_RES := true
-
-# Release name
-PRODUCT_RELEASE_NAME := LG L90
-PRODUCT_NAME := cm_w7
-PRODUCT_MANUFACTURER := lge
-PRODUCT_MODEL := w7
-
-
diff --git a/overlay/frameworks/base/core/res/res/values/arrays.xml b/overlay/frameworks/base/core/res/res/values/arrays.xml
index 43c72a1..12d72f0 100644
--- a/overlay/frameworks/base/core/res/res/values/arrays.xml
+++ b/overlay/frameworks/base/core/res/res/values/arrays.xml
@@ -22,7 +22,6 @@
     <!-- Defines the shutdown options shown in the reboot dialog. -->
         <array name="shutdown_reboot_options" translatable="false">
         <item>@string/reboot_reboot</item>
-        <item>@string/reboot_soft</item>
         <item>@string/reboot_recovery</item>
     </array>
 
@@ -30,7 +29,6 @@
          The first item should be empty for regular reboot. -->
         <string-array name="shutdown_reboot_actions" translatable="false">
         <item></item>
-        <item>soft_reboot</item>
         <item>recovery</item>
     </string-array>
 
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index b0ab9d4..c35ffa9 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -243,20 +243,6 @@
         config to 7. -->
     <integer name="config_deviceHardwareKeys">71</integer>
 
-    <!-- Hardware keys present on the device with the ability to wake, stored as a bit field.
-         This integer should equal the sum of the corresponding value for each
-         of the following keys present:
-             1 - Home
-             2 - Back
-             4 - Menu
-             8 - Assistant (search)
-            16 - App switch
-            32 - Camera
-            64 - Volume rocker
-         For example, a device with Home, Back and Menu keys would set this
-         config to 7. -->
-    <integer name="config_deviceHardwareWakeKeys">1</integer>
-
     <!-- Device supports LED flashlight 
     <bool name="config_enableTorch">true</bool> -->
 
diff --git a/overlay/frameworks/base/core/res/res/values/rr_config.xml b/overlay/frameworks/base/core/res/res/values/rr_config.xml
deleted file mode 100644
index c3bfe1e..0000000
--- a/overlay/frameworks/base/core/res/res/values/rr_config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2010 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Doze: force using accelerometer as pick up sensor -->
-    <bool name="config_dozeUseAccelerometer">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values/strings.xml b/overlay/frameworks/base/core/res/res/values/strings.xml
deleted file mode 100644
index 4855bb0..0000000
--- a/overlay/frameworks/base/core/res/res/values/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2014, 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
-    <string name="battery_saver_description">To help improve battery life, battery saver reduces your device’s performance and limits vibration, ambient display, and most background data. Email, messaging, and other apps that rely on syncing may not update unless you open them.\n\nBattery saver turns off automatically when your device is charging.</string>
-
-</resources>
diff --git a/slim.mk b/slim.mk
new file mode 100644
index 0000000..e85ef3f
--- /dev/null
+++ b/slim.mk
@@ -0,0 +1,29 @@
+$(call inherit-product, device/lge/w7/full_w7.mk)
+
+## Specify phone tech before including full_phone
+$(call inherit-product, vendor/slim/config/gsm.mk)
+
+# Boot animation
+TARGET_SCREEN_WIDTH := 540
+TARGET_SCREEN_HEIGHT := 960
+
+# Inherit some common Slim stuff.
+$(call inherit-product, vendor/slim/config/common_full_phone.mk)
+
+# Configure dalvik heap
+$(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk)
+
+# Enhanced NFC
+$(call inherit-product, vendor/slim/config/nfc_enhanced.mk)
+
+# Release name
+PRODUCT_RELEASE_NAME := LG L90
+
+# Release name
+PRODUCT_RELEASE_NAME := LG L90
+PRODUCT_MANUFACTURER := LGE
+PRODUCT_NAME := slim_w7
+PRODUCT_MANUFACTURER := lge
+PRODUCT_MODEL := w7
+PRODUCT_DEVICE := w7
+
diff --git a/vendorsetup.sh b/vendorsetup.sh
index ab4904b..a83f8d7 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -20,6 +20,5 @@
 # In particular, you can add lunch options with the add_lunch_combo
 # function: add_lunch_combo generic-eng
 
-#dd_lunch_combo full_mb526-eng
-add_lunch_combo cm_w7-userdebug
+add_lunch_combo slim_w7-userdebug