diff --git a/GNexusParts/Android.mk b/GNexusParts/Android.mk
deleted file mode 100644
index e934402e..00000000
--- a/GNexusParts/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := GNexusParts
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/GNexusParts/AndroidManifest.xml b/GNexusParts/AndroidManifest.xml
deleted file mode 100644
index 5b43888d..00000000
--- a/GNexusParts/AndroidManifest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cyanogenmod.settings.device"
-    android:sharedUserId="android.uid.system" >
-
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
-
-    <application android:label="@string/app_name" >
-        <activity
-            android:name="com.cyanogenmod.settings.device.DeviceSettings"
-            android:icon="@drawable/ic_launcher_cmdevicesettings"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="com.cyanogenmod.action.LAUNCH_DEVICE_SETTINGS" />
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.HOME" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <receiver android:name=".Startup" >
-            <intent-filter android:priority="100" >
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-
-        <activity android:name=".GeneralFragmentActivity" />
-        <activity android:name=".DisplayFragmentActivity" />
-        <activity android:name=".SoundFragmentActivity" />
-    </application>
-
-</manifest>
diff --git a/GNexusParts/res/drawable/blue_tuning_preview.xml b/GNexusParts/res/drawable/blue_tuning_preview.xml
deleted file mode 100755
index 98ea313e..00000000
--- a/GNexusParts/res/drawable/blue_tuning_preview.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:angle="0"
-        android:startColor="#000000"
-        android:endColor="#0000FF" />
-</shape>
\ No newline at end of file
diff --git a/GNexusParts/res/drawable/color_tuning_preview.xml b/GNexusParts/res/drawable/color_tuning_preview.xml
deleted file mode 100644
index 2d83c10d..00000000
--- a/GNexusParts/res/drawable/color_tuning_preview.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:angle="0"
-        android:startColor="#000000"
-        android:endColor="#FFFFFF" />
-</shape>
\ No newline at end of file
diff --git a/GNexusParts/res/drawable/green_tuning_preview.xml b/GNexusParts/res/drawable/green_tuning_preview.xml
deleted file mode 100755
index 4f094712..00000000
--- a/GNexusParts/res/drawable/green_tuning_preview.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:angle="0"
-        android:startColor="#000000"
-        android:endColor="#00FF00" />
-</shape>
\ No newline at end of file
diff --git a/GNexusParts/res/drawable/ic_launcher_cmdevicesettings.png b/GNexusParts/res/drawable/ic_launcher_cmdevicesettings.png
deleted file mode 100755
index 66de9c39..00000000
Binary files a/GNexusParts/res/drawable/ic_launcher_cmdevicesettings.png and /dev/null differ
diff --git a/GNexusParts/res/drawable/red_tuning_preview.xml b/GNexusParts/res/drawable/red_tuning_preview.xml
deleted file mode 100755
index a55ea12d..00000000
--- a/GNexusParts/res/drawable/red_tuning_preview.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:angle="0"
-        android:startColor="#000000"
-        android:endColor="#FF0000" />
-</shape>
\ No newline at end of file
diff --git a/GNexusParts/res/layout/preference_colorgamma_presets.xml b/GNexusParts/res/layout/preference_colorgamma_presets.xml
deleted file mode 100755
index bd502876..00000000
--- a/GNexusParts/res/layout/preference_colorgamma_presets.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_horizontal"
-            android:paddingBottom="20dip">
-
-        <ImageView
-            android:id="@+id/imageView0"
-            android:layout_width="match_parent"
-            android:layout_height="200dp"
-            android:paddingLeft="20dip"
-            android:paddingRight="20dip"
-            android:paddingTop="5dip"
-            android:src="@drawable/color_tuning_preview" />
-
-        <ImageView
-            android:id="@+id/imageView1"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:paddingLeft="20dip"
-            android:paddingRight="20dip"
-            android:paddingTop="5dip"
-            android:src="@drawable/red_tuning_preview" />
-
-        <ImageView
-            android:id="@+id/imageView2"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_below="@+id/imageView1"
-            android:paddingLeft="20dip"
-            android:paddingRight="20dip"
-            android:paddingTop="5dip"
-            android:src="@drawable/green_tuning_preview" />
-
-        <ImageView
-            android:id="@+id/imageView3"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_below="@+id/imageView2"
-            android:paddingLeft="20dip"
-            android:paddingRight="20dip"
-            android:paddingTop="5dip"
-            android:src="@drawable/blue_tuning_preview" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/imageView0"
-            android:orientation="vertical" >
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" >
-
-                <Button
-                    android:id="@+id/btnPreset1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/preset1_default_title" android:textSize="10dp" android:width="100dp"/>
-
-                <Button
-                    android:id="@+id/btnPreset2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/preset2_default_title" android:textSize="10dp" android:width="100dp"/>
-
-                <Button
-                    android:id="@+id/btnPreset3"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/preset3_default_title" android:textSize="10dp" android:width="100dp"/>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <Button
-                    android:id="@+id/btnPreset4"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/preset4_default_title" android:textSize="10dp" android:width="100dp"/>
-
-                <Button
-                    android:id="@+id/btnPreset5"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/preset5_default_title" android:textSize="10dp" android:width="100dp"/>
-
-                <Button
-                    android:id="@+id/btnPreset6"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/preset6_default_title" android:textSize="10dp" android:width="100dp"/>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="320dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" >
-
-                <TextView
-                    android:id="@+id/textView1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/credits_presets" android:textSize="12dp"/>
-
-            </LinearLayout>
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</ScrollView>
diff --git a/GNexusParts/res/layout/preference_dialog_color_tuning.xml b/GNexusParts/res/layout/preference_dialog_color_tuning.xml
deleted file mode 100644
index 068f88cc..00000000
--- a/GNexusParts/res/layout/preference_dialog_color_tuning.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_horizontal"
-            android:paddingBottom="20dip">
-
-        <TextView android:id="@+id/color_red_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/color_red_title"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <TextView android:id="@+id/color_red_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <SeekBar android:id="@+id/color_red_seekbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/color_red_text"
-                android:paddingTop="2dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-
-        <TextView android:id="@+id/color_green_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/color_red_seekbar"
-                android:text="@string/color_green_title"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <TextView android:id="@+id/color_green_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/color_red_seekbar"
-                android:layout_alignParentRight="true"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <SeekBar android:id="@+id/color_green_seekbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/color_green_text"
-                android:paddingTop="2dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-
-        <TextView android:id="@+id/color_blue_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/color_green_seekbar"
-                android:text="@string/color_blue_title"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <TextView android:id="@+id/color_blue_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/color_green_seekbar"
-                android:layout_alignParentRight="true"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <SeekBar android:id="@+id/color_blue_seekbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/color_blue_text"
-                android:paddingTop="2dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-
-        <ImageView android:id="@+id/black_scale_picture_color"
-                android:src="@drawable/color_tuning_preview"
-                android:layout_width="match_parent"
-                android:layout_height="40dip"
-                android:layout_below="@id/color_blue_seekbar"
-                android:paddingTop="20dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/black_scale_picture_color" >
-
-            <Button
-                android:id="@+id/btnColorDefault"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/color_default_title" />
-
-            <Button
-                android:id="@+id/btnColorCM"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/color_CM_title" />
-
-            <Button
-                android:id="@+id/btnColorDark"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/color_dark_title" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-</ScrollView>
diff --git a/GNexusParts/res/layout/preference_dialog_gamma_tuning.xml b/GNexusParts/res/layout/preference_dialog_gamma_tuning.xml
deleted file mode 100644
index 8df2204f..00000000
--- a/GNexusParts/res/layout/preference_dialog_gamma_tuning.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_horizontal"
-            android:paddingBottom="20dip">
-
-        <TextView android:id="@+id/gamma_red_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/color_red_title"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <TextView android:id="@+id/gamma_red_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <SeekBar android:id="@+id/gamma_red_seekbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/gamma_red_text"
-                android:paddingTop="2dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-
-        <TextView android:id="@+id/gamma_green_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/gamma_red_seekbar"
-                android:text="@string/color_green_title"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <TextView android:id="@+id/gamma_green_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/gamma_red_seekbar"
-                android:layout_alignParentRight="true"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <SeekBar android:id="@+id/gamma_green_seekbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/gamma_green_text"
-                android:paddingTop="2dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-
-        <TextView android:id="@+id/gamma_blue_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/gamma_green_seekbar"
-                android:text="@string/color_blue_title"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <TextView android:id="@+id/gamma_blue_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/gamma_green_seekbar"
-                android:layout_alignParentRight="true"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <SeekBar android:id="@+id/gamma_blue_seekbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/gamma_blue_text"
-                android:paddingTop="2dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-
-        <TextView android:id="@+id/gamma_dss_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/gamma_blue_seekbar"
-                android:text="@string/gamma_dss_title"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <TextView android:id="@+id/gamma_dss_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/gamma_blue_seekbar"
-                android:layout_alignParentRight="true"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <SeekBar android:id="@+id/gamma_dss_seekbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/gamma_dss_text"
-                android:paddingTop="2dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-
-        <ImageView android:id="@+id/black_scale_picture"
-                android:src="@drawable/color_tuning_preview"
-                android:layout_width="match_parent"
-                android:layout_height="40dip"
-                android:layout_below="@id/gamma_dss_seekbar"
-                android:paddingTop="20dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/black_scale_picture" >
-
-            <Button
-                android:id="@+id/btnGammaDefault"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/gamma_default_title" />
-
-            <Button
-                android:id="@+id/btnGammaCM"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/gamma_CM_title" />
-
-            <Button
-                android:id="@+id/btnGammaBright"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/gamma_bright_title" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-</ScrollView>
diff --git a/GNexusParts/res/layout/top.xml b/GNexusParts/res/layout/top.xml
deleted file mode 100755
index 744b568c..00000000
--- a/GNexusParts/res/layout/top.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/viewPager"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
-
diff --git a/GNexusParts/res/values-de/strings.xml b/GNexusParts/res/values-de/strings.xml
deleted file mode 100644
index e5cfecc8..00000000
--- a/GNexusParts/res/values-de/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Galaxy Nexus Einstellungen</string>
-
-    <!-- Page Headers -->
-    <string name="general_title">ALLGEMEIN</string>
-    <string name="display_title">BILDSCHIRM</string>
-
-    <string name="category_system_title">System</string>
-    <string name="category_screen_title">WM8994 Einstellungen ( voodoo )</string>
-    <string name="color_tuning_title_head">Farbmultiplikator</string>
-    <string name="color_tuning_summary_head">Farbmultiplikator einstellen</string>
-    <string name="gamma_tuning_title_head">Gammakorrektur</string>
-    <string name="gamma_tuning_summary_head">Gammawert einstellen</string>
-    <string name="color_hack_presets_title_head">Farb-Voreinstellungen</string>
-    <string name="color_hack_presets_summary_head">Voreinstellungen für Gammakorrektur und Farbmultiplikator</string>
-    <string name="color_red_title">Rot</string>
-    <string name="color_green_title">Grün</string>
-    <string name="color_blue_title">Blau</string>
-    <string name="gamma_default_title">Standard</string>
-    <string name="gamma_CM_title">CM</string>
-    <string name="gamma_bright_title">Hell</string>
-    <string name="color_default_title">Standard</string>
-    <string name="color_CM_title">CM</string>
-    <string name="color_dark_title">Dunkel</string>
-    <string name="gamma_dss_title">DSS Gammawert</string>
-
-    <string name="preset1_default_title">Standard</string>
-    <string name="preset2_default_title">Natürlich</string>
-    <string name="preset3_default_title">Dunkles Blau</string>
-    <string name="preset4_default_title">Warm</string>
-    <string name="preset5_default_title">Kalt</string>
-    <string name="preset6_default_title">X-Processing</string>
-    <string name="credits_presets">Dank an: ale.landra91 cpaixao provolinoo</string>
-
-    <string name="category_radio_title">Mobilfunk</string>
-    <string name="hspa_title_head">HSPA</string>
-    <string name="hspa_summary_head">HSDPA/HSUPA aktivieren</string>
-
-</resources>
diff --git a/GNexusParts/res/values-ja/strings.xml b/GNexusParts/res/values-ja/strings.xml
deleted file mode 100644
index 6a650f3b..00000000
--- a/GNexusParts/res/values-ja/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Galaxy Nexus 設定</string>
-
-    <!-- Page Headers -->
-    <string name="general_title">一般</string>
-    <string name="display_title">ディスプレイ</string>
-
-    <string name="category_system_title">SYSTEM</string>
-    <string name="category_screen_title">WM8994設定 ( voodoo )</string>
-    <string name="color_tuning_title_head">カラーマルチプライヤチューニング</string>
-    <string name="color_tuning_summary_head">画面の色味を調整する</string>
-    <string name="gamma_tuning_title_head">カラーガンマ調整</string>
-    <string name="gamma_tuning_summary_head">カラーガンマ値を調整する</string>
-    <string name="color_red_title">赤</string>
-    <string name="color_green_title">緑</string>
-    <string name="color_blue_title">青</string>
-
-    <string name="category_radio_title">ラジオ</string>
-    <string name="hspa_title_head">HSPA</string>
-    <string name="hspa_summary_head">HSDPA/HSUPAを有効にする</string>
-
-</resources>
diff --git a/GNexusParts/res/values-nl/strings.xml b/GNexusParts/res/values-nl/strings.xml
deleted file mode 100644
index 414f3afc..00000000
--- a/GNexusParts/res/values-nl/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2012 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 name="app_name">Galaxy Nexus-instellingen</string>
-    <string name="general_title">ALGEMEEN</string>
-    <string name="display_title">WEERGAVE</string>
-    <string name="category_screen_title">WM8994-instellingen (voodoo)</string>
-    <string name="color_tuning_title_head">Kleurenmultiplicatoren afstemmen</string>
-    <string name="color_tuning_summary_head">Kalibreer multiplicatoren van schermkleur</string>
-    <string name="gamma_tuning_title_head">Kleurengamma afstemmen</string>
-    <string name="gamma_tuning_summary_head">Kalibreer correctie van kleurengamma</string>
-    <string name="color_red_title">Rood</string>
-    <string name="color_green_title">Groen</string>
-    <string name="color_blue_title">Blauw</string>
-    <string name="hspa_summary_head">Schakel HSDPA/HSUPA in/uit</string>
-</resources>
diff --git a/GNexusParts/res/values-pt/strings.xml b/GNexusParts/res/values-pt/strings.xml
deleted file mode 100755
index a189ad9c..00000000
--- a/GNexusParts/res/values-pt/strings.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Configurações Galaxy Nexus</string>
-    <string name="general_title">Geral</string>
-    <string name="display_title">Tela</string>
-    <string name="category_cpu_title">CPU</string>
-    <string name="category_screen_title">Configurações VM8994 ( voodoo )</string>
-    <string name="color_tuning_title_head">Ajustar Multiplicadores de Cor</string>
-    <string name="color_tuning_summary_head">Calibrar multiplicadores de cor de tela</string>
-    <string name="gamma_tuning_title_head">Ajustar Cor Gama</string>
-    <string name="gamma_tuning_summary_head">Calibrar correção de cor gama</string>
-    <string name="color_hack_presets_title_head">Predefinir hack de cor</string>
-    <string name="color_hack_presets_summary_head">Predefinições para gama e multiplicadores testado por alguns usuários</string>
-    <string name="color_red_title">Vermelho</string>
-    <string name="color_green_title">Verde</string>
-    <string name="color_blue_title">Azul</string>
-    <string name="gamma_default_title">Padrão</string>
-    <string name="gamma_CM_title">Conf. CM</string>
-    <string name="gamma_bright_title">Conf. de Brilho</string>
-    <string name="color_default_title">Padrão</string>
-    <string name="color_CM_title">Conf. CM</string>
-    <string name="color_dark_title">Conf. Escuro</string>
-    <string name="gamma_dss_title">Conf. DSS Gama</string>
-    <string name="preset1_default_title">Padrão.</string>
-    <string name="preset2_default_title">Natural</string>
-    <string name="preset3_default_title">Azul Escuro</string>
-    <string name="preset4_default_title">Quente</string>
-    <string name="preset5_default_title">Frio Escuro</string>
-    <string name="preset6_default_title">Cross Proc.</string>
-    <string name="credits_presets">Créditos: ale.landra91 cpaixao provolinoo</string>
-    <string name="category_touchkey_title">Teclas sensíveis ao toque</string>
-    <string name="touchkey_notification_title_head">Notificações de luz de fundo</string>
-    <string name="touchkey_notification_summary_head">A luz de fundo das teclas irão acender quando haver uma notificação.</string>
-    <string name="category_radio_title">Radio</string>
-    <string name="hspa_title_head">HSPA</string>
-    <string name="hspa_summary_head">Ativar HSDPA/HSUPA</string>
-</resources>
\ No newline at end of file
diff --git a/GNexusParts/res/values-ru/strings.xml b/GNexusParts/res/values-ru/strings.xml
deleted file mode 100644
index 676e4303..00000000
--- a/GNexusParts/res/values-ru/strings.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Настройки Galaxy Nexus</string>
-
-    <!-- Page Headers -->
-    <string name="general_title">ОСНОВНЫЕ</string>
-    <string name="display_title">ДИСПЛЕЙ</string>
-
-    <string name="category_screen_title">Настройки WM8994 ( voodoo )</string>
-    <string name="color_tuning_title_head">Настройка цвета мультипликатора</string>
-    <string name="color_tuning_summary_head">Калибровка цвета мультипликатора</string>
-    <string name="gamma_tuning_title_head">Настройка цветовой гаммы</string>
-    <string name="gamma_tuning_summary_head">Калибровка коррекции цветовой гаммы</string>
-    <string name="color_hack_presets_title_head">Предустановки настроек</string>
-    <string name="color_hack_presets_summary_head">Установки для цветовой гаммы и мультипликатора проверенные некоторыми пользователями</string>
-    <string name="color_red_title">Красный</string>
-    <string name="color_green_title">Зелёный</string>
-    <string name="color_blue_title">Синий</string>
-    <string name="gamma_default_title">По умолч.</string>
-    <string name="gamma_CM_title">Настр. CM</string>
-    <string name="gamma_bright_title">Ярко</string>
-    <string name="color_default_title">По умолч.</string>
-    <string name="color_CM_title">Настр. CM</string>
-    <string name="color_dark_title">Темно</string>
-    <string name="gamma_dss_title">Настр. DSS гаммы</string>
-
-    <string name="preset1_default_title">По умолчанию</string>
-    <string name="preset2_default_title">Естественный</string>
-    <string name="preset3_default_title">Тёмно-синий</string>
-    <string name="preset4_default_title">Тёплый</string>
-    <string name="preset5_default_title">Хол. тёмный</string>
-    <string name="preset6_default_title">Перекр. обраб.</string>
-    <string name="credits_presets">Участники: ale.landra91 cpaixao provolinoo</string>
-
-    <string name="category_touchkey_title">Сенсорные копки</string>
-    <string name="touchkey_notification_title_head">Подсветка уведомлений</string>
-    <string name="touchkey_notification_summary_head">Подсветка сенсорных клавиш включена, когда есть уведомления</string>
-
-    <string name="category_radio_title">Радио</string>
-    <string name="hspa_summary_head">Включить HSDPA/HSUPA</string>
-
-</resources>
diff --git a/GNexusParts/res/values/strings.xml b/GNexusParts/res/values/strings.xml
deleted file mode 100644
index 894206f6..00000000
--- a/GNexusParts/res/values/strings.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Galaxy Nexus Settings</string>
-
-    <!-- Page Headers -->
-    <string name="general_title">GENERAL</string>
-    <string name="display_title">DISPLAY</string>
-
-    <string name="category_system_title">System</string>
-    <string name="category_screen_title">WM8994 Settings ( voodoo )</string>
-    <string name="color_tuning_title_head">Color Multipliers Tuning</string>
-    <string name="color_tuning_summary_head">Calibrate multipliers screen color</string>
-    <string name="gamma_tuning_title_head">Color Gamma Tuning</string>
-    <string name="gamma_tuning_summary_head">Calibrate gamma color correction</string>
-    <string name="color_hack_presets_title_head">Color hack presets</string>
-    <string name="color_hack_presets_summary_head">Presets for gamma and multipliers tested by some users</string>
-    <string name="color_red_title">Red</string>
-    <string name="color_green_title">Green</string>
-    <string name="color_blue_title">Blue</string>
-    <string name="gamma_default_title">Default</string>
-    <string name="gamma_CM_title">CM Sett.</string>
-    <string name="gamma_bright_title">Bright Sett.</string>
-    <string name="color_default_title">Default</string>
-    <string name="color_CM_title">CM Sett.</string>
-    <string name="color_dark_title">Dark Sett.</string>
-    <string name="gamma_dss_title">DSS Gamma Set.</string>
-
-    <string name="preset1_default_title">Default.</string>
-    <string name="preset2_default_title">Natural</string>
-    <string name="preset3_default_title">Dark Blue</string>
-    <string name="preset4_default_title">Warm</string>
-    <string name="preset5_default_title">Dark Cold</string>
-    <string name="preset6_default_title">Cross Proc.</string>
-    <string name="credits_presets">Credits: ale.landra91 cpaixao malycomix</string>
-
-    <string name="category_touchkey_title">Touch Keys</string>
-    <string name="touchkey_notification_title_head">Backlight Notifications</string>
-    <string name="touchkey_notification_summary_head">The touch key backlights will turn on when there is a notification.</string>
-
-    <string name="category_radio_title">Radio</string>
-    <string name="hspa_title_head">HSPA</string>
-    <string name="hspa_summary_head">Enable HSDPA/HSUPA</string>
-
-    <string name="usb_fastcharge_title_head">Fast charge USB</string>
-    <string name="usb_fastcharge_summary_head">Fast charge when connected to computer USB interface</string>
-
-</resources>
diff --git a/GNexusParts/res/xml/display_preferences.xml b/GNexusParts/res/xml/display_preferences.xml
deleted file mode 100755
index 45795d1f..00000000
--- a/GNexusParts/res/xml/display_preferences.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/app_name">
-
-    <!-- Color tuning -->
-    <com.cyanogenmod.settings.device.ColorTuningPreference
-        android:key="color_tuning"
-        android:title="@string/color_tuning_title_head"
-        android:summary="@string/color_tuning_summary_head" />
-    <com.cyanogenmod.settings.device.GammaTuningPreference
-        android:key="gamma_tuning"
-        android:title="@string/gamma_tuning_title_head"
-        android:summary="@string/gamma_tuning_summary_head" />
-    <com.cyanogenmod.settings.device.ColorHackPresets
-        android:key="color_presets"
-        android:title="@string/color_hack_presets_title_head"
-        android:summary="@string/color_hack_presets_summary_head" />
-
-</PreferenceScreen>
diff --git a/GNexusParts/res/xml/general_preferences.xml b/GNexusParts/res/xml/general_preferences.xml
deleted file mode 100644
index 2bf2c43d..00000000
--- a/GNexusParts/res/xml/general_preferences.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- General settings -->
-    <PreferenceCategory android:key="category_system"
-        android:title="@string/category_system_title">
-
-        <CheckBoxPreference android:key="fast_charge_usb"
-            android:title="@string/usb_fastcharge_title_head"
-            android:summary="@string/usb_fastcharge_summary_head" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/ColorHackPresets.java b/GNexusParts/src/com/cyanogenmod/settings/device/ColorHackPresets.java
deleted file mode 100644
index 4d0d02c8..00000000
--- a/GNexusParts/src/com/cyanogenmod/settings/device/ColorHackPresets.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (C) 2011 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.
- */
-
-package com.cyanogenmod.settings.device;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.preference.DialogPreference;
-import android.preference.PreferenceManager;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.TextView;
-import android.widget.Button;
-import android.util.Log;
-
-/**
- * Special preference type that allows configuration of both the ring volume and
- * notification volume.
- */
-public class ColorHackPresets extends DialogPreference implements OnClickListener {
-
-    private static final String TAG = "PRESETS...";
-
-    private static final String[] FILE_PATH_GAMMA = new String[] {
-            "/sys/class/misc/samoled_color/red_v1_offset",
-            "/sys/class/misc/samoled_color/green_v1_offset",
-            "/sys/class/misc/samoled_color/blue_v1_offset"
-    };
-
-    private static final String[] FILE_PATH_MULTI = new String[] {
-            "/sys/class/misc/samoled_color/red_multiplier",
-            "/sys/class/misc/samoled_color/green_multiplier",
-            "/sys/class/misc/samoled_color/blue_multiplier"
-    };
-
-    // Track instances to know when to restore original color
-    // (when the orientation changes, a new dialog is created before the old one
-    // is destroyed)
-    private static int sInstances = 0;
-
-    // Align MAX_VALUE with Voodoo Control settings
-    private static final int MAX_VALUE = Integer.MAX_VALUE - 2;
-
-    public ColorHackPresets(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        setDialogLayoutResource(R.layout.preference_colorgamma_presets);
-    }
-
-    @Override
-    protected void onBindDialogView(View view) {
-        super.onBindDialogView(view);
-
-        sInstances++;
-
-        SetupButtonClickListeners(view);
-    }
-
-    private void SetupButtonClickListeners(View view) {
-        Button[] mPresets = new Button[6];
-
-        mPresets[0] = (Button)view.findViewById(R.id.btnPreset1);
-        mPresets[1] = (Button)view.findViewById(R.id.btnPreset2);
-        mPresets[2] = (Button)view.findViewById(R.id.btnPreset3);
-        mPresets[3] = (Button)view.findViewById(R.id.btnPreset4);
-        mPresets[4] = (Button)view.findViewById(R.id.btnPreset5);
-        mPresets[5] = (Button)view.findViewById(R.id.btnPreset6);
-        for (int i = 0; i < 6; i++) {
-            mPresets[i].setOnClickListener(this);
-        }
-    }
-
-    @Override
-    protected void onDialogClosed(boolean positiveResult) {
-        super.onDialogClosed(positiveResult);
-
-        sInstances--;
-
-    }
-
-    /**
-     * Restore screen color tuning from SharedPreferences. (Write to kernel.)
-     * 
-     * @param context The context to read the SharedPreferences from
-     */
-    public static void restore(Context context) {
-        if (!isSupported()) {
-            return;
-        }
-
-    }
-
-    /**
-     * Check whether the running kernel supports color tuning or not.
-     * 
-     * @return Whether color tuning is supported or not
-     */
-    public static boolean isSupported() {
-        boolean supported = true;
-        for (String filePath : FILE_PATH_GAMMA) {
-            if (!Utils.fileExists(filePath)) {
-                supported = false;
-            }
-        }
-
-        return supported;
-    }
-
-    public void onClick(View v) {
-        switch(v.getId()){
-            case R.id.btnPreset1:
-                    Preset1();
-                    break;
-            case R.id.btnPreset2:
-                    Preset2();
-                    break;
-            case R.id.btnPreset3:
-                    Preset3();
-                    break;
-            case R.id.btnPreset4:
-                    Preset4();
-                    break;
-            case R.id.btnPreset5:
-                    Preset5();
-                    break;
-            case R.id.btnPreset6:
-                    Preset6();
-                    break;
-        }
-    }
-
-    private void WriteMultiplier(Double fValue , int iPos) {
-        int iValue = (int) ((double) MAX_VALUE * fValue);
-        Utils.writeColor(FILE_PATH_MULTI[iPos], iValue);
-        Log.i(TAG,"KalimAz: Multiplier: " + iPos+ " Value " + iValue );
-    }
-
-    private void WriteGamma(int iValue , int iPos) {
-        Utils.writeValue(FILE_PATH_GAMMA[iPos], String.valueOf((long) iValue));
-        Log.i(TAG,"KalimAz: Gamma: " + iPos+ " Value " + iValue );
-    }
-
-    private void Preset1() {
-        WriteMultiplier(1.0, 0);
-        WriteMultiplier(1.0, 1);
-        WriteMultiplier(1.0, 2);
-        WriteGamma(0, 0);
-        WriteGamma(0, 1);
-        WriteGamma(0, 2);
-    }
-
-    private void Preset2() {
-        WriteMultiplier(0.8575, 0);
-        WriteMultiplier(0.8575, 1);
-        WriteMultiplier(0.8575, 2);
-        WriteGamma(-12, 0);
-        WriteGamma(12, 1);
-        WriteGamma(-12, 2);
-    }
-
-    private void Preset3() {
-        WriteMultiplier(0.458602179, 0);
-        WriteMultiplier(0.6311828147, 1);
-        WriteMultiplier(0.82258, 2);
-        WriteGamma(-31, 0);
-        WriteGamma(-18, 1);
-        WriteGamma(-0, 2);
-    }
-
-    private void Preset4() {
-        WriteMultiplier(0.7231, 0);
-        WriteMultiplier(0.7016, 1);
-        WriteMultiplier(0.6532, 2);
-        WriteGamma(-31, 0);
-        WriteGamma(-30, 1);
-        WriteGamma(-14, 2);
-    }
-
-    private void Preset5() {
-        WriteMultiplier(0.6666, 0);
-        WriteMultiplier(0.6666, 1);
-        WriteMultiplier(0.8333, 2);
-        WriteGamma(-44, 0);
-        WriteGamma(-44, 1);
-        WriteGamma(-7, 2);
-    }
-
-    private void Preset6() {
-        WriteMultiplier(1.0, 0);
-        WriteMultiplier(0.7688, 1);
-        WriteMultiplier(0.2473, 2);
-        WriteGamma(-57, 0);
-        WriteGamma(-75, 1);
-        WriteGamma(45, 2);
-    }
-
-}
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/ColorTuningPreference.java b/GNexusParts/src/com/cyanogenmod/settings/device/ColorTuningPreference.java
deleted file mode 100644
index 0ca7ae26..00000000
--- a/GNexusParts/src/com/cyanogenmod/settings/device/ColorTuningPreference.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright (C) 2011 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.
- */
-
-package com.cyanogenmod.settings.device;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.preference.DialogPreference;
-import android.preference.PreferenceManager;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.SeekBar;
-import android.widget.TextView;
-import android.util.Log;
-import android.widget.Button;
-
-/**
- * Special preference type that allows configuration of both the ring volume and
- * notification volume.
- */
-public class ColorTuningPreference extends DialogPreference implements OnClickListener {
-
-    private static final String TAG = "COLOR...";
-
-    enum Colors {
-        RED, GREEN, BLUE
-    };
-
-    private static final int[] SEEKBAR_ID = new int[] {
-            R.id.color_red_seekbar, R.id.color_green_seekbar, R.id.color_blue_seekbar
-    };
-
-    private static final int[] VALUE_DISPLAY_ID = new int[] {
-            R.id.color_red_value, R.id.color_green_value, R.id.color_blue_value
-    };
-
-    private static final String[] FILE_PATH = new String[] {
-            "/sys/class/misc/samoled_color/red_multiplier",
-            "/sys/class/misc/samoled_color/green_multiplier",
-            "/sys/class/misc/samoled_color/blue_multiplier"
-    };
-
-    private ColorSeekBar mSeekBars[] = new ColorSeekBar[3];
-
-    // Align MAX_VALUE with Voodoo Control settings
-    private static final int MAX_VALUE = Integer.MAX_VALUE - 2;
-
-    // Track instances to know when to restore original color
-    // (when the orientation changes, a new dialog is created before the old one
-    // is destroyed)
-    private static int sInstances = 0;
-
-    public ColorTuningPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        setDialogLayoutResource(R.layout.preference_dialog_color_tuning);
-    }
-
-    @Override
-    protected void onBindDialogView(View view) {
-        super.onBindDialogView(view);
-
-        sInstances++;
-
-        for (int i = 0; i < SEEKBAR_ID.length; i++) {
-            SeekBar seekBar = (SeekBar) view.findViewById(SEEKBAR_ID[i]);
-            TextView valueDisplay = (TextView) view.findViewById(VALUE_DISPLAY_ID[i]);
-            mSeekBars[i] = new ColorSeekBar(seekBar, valueDisplay, FILE_PATH[i]);
-        }
-        SetupButtonClickListeners(view);
-    }
-
-    private void SetupButtonClickListeners(View view) {
-            Button mDefaultButton = (Button)view.findViewById(R.id.btnColorDefault);
-            Button mCMButton = (Button)view.findViewById(R.id.btnColorCM);
-            Button mDarkButton = (Button)view.findViewById(R.id.btnColorDark);
-            mDefaultButton.setOnClickListener(this);
-            mCMButton.setOnClickListener(this);
-            mDarkButton.setOnClickListener(this);
-    }
-
-    @Override
-    protected void onDialogClosed(boolean positiveResult) {
-        super.onDialogClosed(positiveResult);
-
-        sInstances--;
-
-        if (positiveResult) {
-            for (ColorSeekBar csb : mSeekBars) {
-                csb.save();
-            }
-        } else if (sInstances == 0) {
-            for (ColorSeekBar csb : mSeekBars) {
-                csb.reset();
-            }
-        }
-    }
-
-    /**
-     * Restore screen color tuning from SharedPreferences. (Write to kernel.)
-     * 
-     * @param context The context to read the SharedPreferences from
-     */
-    public static void restore(Context context) {
-        int iValue, iValue2;
-        if (!isSupported()) {
-            return;
-        }
-
-        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-
-        for (String filePath : FILE_PATH) {
-            String sDefaultValue = Utils.readOneLine(filePath);
-            Log.d(TAG,"INIT: " + sDefaultValue);
-            try {
-                iValue2 = Integer.parseInt(sDefaultValue);
-            } catch (NumberFormatException e) {
-                iValue2 = MAX_VALUE;
-            }
-            try {
-                iValue = sharedPrefs.getInt(filePath, iValue2);
-                Log.d(TAG, "restore: iValue: " + iValue + " File: " + filePath);
-            } catch (NumberFormatException e) {
-                iValue = iValue2;
-                Log.e(TAG, "restore ERROR: iValue: " + iValue + " File: " + filePath);
-            }
-            Utils.writeColor(filePath, (int) iValue);
-        }
-    }
-
-    /**
-     * Check whether the running kernel supports color tuning or not.
-     * 
-     * @return Whether color tuning is supported or not
-     */
-    public static boolean isSupported() {
-        boolean supported = true;
-        for (String filePath : FILE_PATH) {
-            if (!Utils.fileExists(filePath)) {
-                supported = false;
-            }
-        }
-
-        return supported;
-    }
-
-    class ColorSeekBar implements SeekBar.OnSeekBarChangeListener {
-
-        private String mFilePath;
-
-        private int mOriginal;
-
-        private SeekBar mSeekBar;
-
-        private TextView mValueDisplay;
-
-        public ColorSeekBar(SeekBar seekBar, TextView valueDisplay, String filePath) {
-            int iValue;
-
-            mSeekBar = seekBar;
-            mValueDisplay = valueDisplay;
-            mFilePath = filePath;
-
-            SharedPreferences sharedPreferences = getSharedPreferences();
-
-            // Read original value
-            if (Utils.fileExists(mFilePath)) {
-                String sDefaultValue = Utils.readOneLine(mFilePath);
-                iValue = (int) (Long.valueOf(sDefaultValue) / 2);
-            } else {
-                iValue = sharedPreferences.getInt(mFilePath, MAX_VALUE);
-            }
-            mOriginal = iValue;
-
-            mSeekBar.setMax(MAX_VALUE);
-            reset();
-            mSeekBar.setOnSeekBarChangeListener(this);
-        }
-
-        public void reset() {
-            mSeekBar.setProgress(mOriginal);
-            updateValue(mOriginal);
-        }
-
-        public void save() {
-            Editor editor = getEditor();
-            editor.putInt(mFilePath, mSeekBar.getProgress());
-            editor.commit();
-        }
-
-        @Override
-        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-            Utils.writeColor(mFilePath, progress);
-            updateValue(progress);
-        }
-
-        @Override
-        public void onStartTrackingTouch(SeekBar seekBar) {
-            // Do nothing
-        }
-
-        @Override
-        public void onStopTrackingTouch(SeekBar seekBar) {
-            // Do nothing
-        }
-
-        private void updateValue(int progress) {
-            mValueDisplay.setText(String.format("%.10f", (double) progress / MAX_VALUE));
-        }
-
-        public void SetNewValue(int iValue) {
-            mOriginal = iValue;
-            reset();
-        }
-
-    }
-
-    public void onClick(View v) {
-        switch(v.getId()){
-            case R.id.btnColorDefault:
-                    SetDefaultSettings();
-                    break;
-            case R.id.btnColorCM:
-                    SetCMSettings();
-                    break;
-            case R.id.btnColorDark:
-                    SetDarkSettings();
-                    break;
-        }
-    }
-
-    private void SetCMSettings() {
-        mSeekBars[0].SetNewValue(1766478464);
-        mSeekBars[1].SetNewValue(1766478464);
-        mSeekBars[2].SetNewValue(1766478464);
-    }
-
-    private void SetDarkSettings() {
-        mSeekBars[0].SetNewValue(877466432);
-        mSeekBars[1].SetNewValue(877466432);
-        mSeekBars[2].SetNewValue(877466432);
-    }
-
-    private void SetDefaultSettings() {
-        mSeekBars[0].SetNewValue(MAX_VALUE);
-        mSeekBars[1].SetNewValue(MAX_VALUE);
-        mSeekBars[2].SetNewValue(MAX_VALUE);
-    }
-}
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java b/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java
deleted file mode 100644
index d5d7838f..00000000
--- a/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 2011 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.
- */
-
-package com.cyanogenmod.settings.device;
-
-import android.app.ActionBar;
-import android.app.ActionBar.Tab;
-import android.app.ActionBar.TabListener;
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.support.v13.app.FragmentPagerAdapter;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.view.ViewPager;
-
-import com.cyanogenmod.settings.device.R;
-
-import java.util.ArrayList;
-
-public class DeviceSettings extends Activity {
-
-    public static final String SHARED_PREFERENCES_BASENAME = "com.cyanogenmod.settings.device";
-    public static final String ACTION_UPDATE_PREFERENCES = "com.cyanogenmod.settings.device.UPDATE";
-    public static final String KEY_COLOR_TUNING = "color_tuning";
-    public static final String KEY_GAMMA_TUNING = "gamma_tuning";
-    public static final String KEY_CATEGORY_RADIO = "category_radio";
-    public static final String KEY_HSPA = "hspa";
-    public static final String KEY_USB_FAST_CHARGE = "fast_charge_usb";
-
-    ViewPager mViewPager;
-    TabsAdapter mTabsAdapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mViewPager = new ViewPager(this);
-        mViewPager.setId(R.id.viewPager);
-        setContentView(mViewPager);
-
-        final ActionBar bar = getActionBar();
-        bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
-        bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE, ActionBar.DISPLAY_SHOW_TITLE);
-        bar.setTitle(R.string.app_name);
-
-        mTabsAdapter = new TabsAdapter(this, mViewPager);
-        mTabsAdapter.addTab(bar.newTab().setText(R.string.display_title),
-                DisplayFragmentActivity.class, null);
-        mTabsAdapter.addTab(bar.newTab().setText(R.string.general_title),
-                GeneralFragmentActivity.class, null);
-
-        if (savedInstanceState != null) {
-            bar.setSelectedNavigationItem(savedInstanceState.getInt("tab", 0));
-        }
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt("tab", getActionBar().getSelectedNavigationIndex());
-    }
-
-    public static class TabsAdapter extends FragmentPagerAdapter
-            implements ActionBar.TabListener, ViewPager.OnPageChangeListener {
-        private final Context mContext;
-        private final ActionBar mActionBar;
-        private final ViewPager mViewPager;
-        private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>();
-
-        static final class TabInfo {
-            private final Class<?> clss;
-            private final Bundle args;
-
-            TabInfo(Class<?> _class, Bundle _args) {
-                clss = _class;
-                args = _args;
-            }
-        }
-
-        public TabsAdapter(Activity activity, ViewPager pager) {
-            super(activity.getFragmentManager());
-            mContext = activity;
-            mActionBar = activity.getActionBar();
-            mViewPager = pager;
-            mViewPager.setAdapter(this);
-            mViewPager.setOnPageChangeListener(this);
-        }
-
-        public void addTab(ActionBar.Tab tab, Class<?> clss, Bundle args) {
-            TabInfo info = new TabInfo(clss, args);
-            tab.setTag(info);
-            tab.setTabListener(this);
-            mTabs.add(info);
-            mActionBar.addTab(tab);
-            notifyDataSetChanged();
-        }
-
-        @Override
-        public int getCount() {
-            return mTabs.size();
-        }
-
-        @Override
-        public Fragment getItem(int position) {
-            TabInfo info = mTabs.get(position);
-            return Fragment.instantiate(mContext, info.clss.getName(), info.args);
-        }
-
-        @Override
-        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-        }
-
-        @Override
-        public void onPageSelected(int position) {
-            mActionBar.setSelectedNavigationItem(position);
-        }
-
-        @Override
-        public void onPageScrollStateChanged(int state) {
-        }
-
-        @Override
-        public void onTabSelected(Tab tab, FragmentTransaction ft) {
-            Object tag = tab.getTag();
-            for (int i=0; i<mTabs.size(); i++) {
-                if (mTabs.get(i) == tag) {
-                    mViewPager.setCurrentItem(i);
-                }
-            }
-        }
-
-        @Override
-        public void onTabUnselected(Tab tab, FragmentTransaction ft) {
-        }
-
-        @Override
-        public void onTabReselected(Tab tab, FragmentTransaction ft) {
-        }
-    }
-}
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/DisplayFragmentActivity.java b/GNexusParts/src/com/cyanogenmod/settings/device/DisplayFragmentActivity.java
deleted file mode 100755
index b2ae5781..00000000
--- a/GNexusParts/src/com/cyanogenmod/settings/device/DisplayFragmentActivity.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2011 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.
- */
-
-package com.cyanogenmod.settings.device;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
-import android.util.Log;
-
-import com.cyanogenmod.settings.device.R;
-
-public class DisplayFragmentActivity extends PreferenceFragment {
-
-    private ColorTuningPreference mColorTuning;
-    private GammaTuningPreference mGammaTuning;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.display_preferences);
-
-        mColorTuning = (ColorTuningPreference) findPreference(DeviceSettings.KEY_COLOR_TUNING);
-        mColorTuning.setEnabled(ColorTuningPreference.isSupported());
-
-        mGammaTuning = (GammaTuningPreference) findPreference(DeviceSettings.KEY_GAMMA_TUNING);
-        mGammaTuning.setEnabled(GammaTuningPreference.isSupported());
-    }
-
-}
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/GammaTuningPreference.java b/GNexusParts/src/com/cyanogenmod/settings/device/GammaTuningPreference.java
deleted file mode 100644
index 749398bb..00000000
--- a/GNexusParts/src/com/cyanogenmod/settings/device/GammaTuningPreference.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (C) 2011 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.
- */
-
-package com.cyanogenmod.settings.device;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.preference.DialogPreference;
-import android.preference.PreferenceManager;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.SeekBar;
-import android.widget.TextView;
-import android.widget.Button;
-import android.util.Log;
-
-/**
- * Special preference type that allows configuration of both the ring volume and
- * notification volume.
- */
-public class GammaTuningPreference extends DialogPreference implements OnClickListener {
-
-    private static final String TAG = "GAMMA...";
-
-    enum Colors {
-        RED, GREEN, BLUE
-    };
-
-    private static final int[] SEEKBAR_ID = new int[] {
-            R.id.gamma_red_seekbar, R.id.gamma_green_seekbar, R.id.gamma_blue_seekbar, R.id.gamma_dss_seekbar
-    };
-
-    private static final int[] VALUE_DISPLAY_ID = new int[] {
-            R.id.gamma_red_value, R.id.gamma_green_value, R.id.gamma_blue_value, R.id.gamma_dss_value
-    };
-
-    private static final String[] FILE_PATH = new String[] {
-            "/sys/class/misc/samoled_color/red_v1_offset",
-            "/sys/class/misc/samoled_color/green_v1_offset",
-            "/sys/class/misc/samoled_color/blue_v1_offset",
-            "/sys/devices/platform/omapdss/manager0/gamma"
-    };
-
-    private GammaSeekBar mSeekBars[] = new GammaSeekBar[4];
-
-    private static final int MAX_VALUE = 200;
-
-    private static final int OFFSET_VALUE = 100;
-
-    // Track instances to know when to restore original color
-    // (when the orientation changes, a new dialog is created before the old one
-    // is destroyed)
-    private static int sInstances = 0;
-
-    public GammaTuningPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        setDialogLayoutResource(R.layout.preference_dialog_gamma_tuning);
-    }
-
-    @Override
-    protected void onBindDialogView(View view) {
-        super.onBindDialogView(view);
-
-        sInstances++;
-
-        for (int i = 0; i < SEEKBAR_ID.length; i++) {
-            SeekBar seekBar = (SeekBar) view.findViewById(SEEKBAR_ID[i]);
-            TextView valueDisplay = (TextView) view.findViewById(VALUE_DISPLAY_ID[i]);
-            if (i < 3)
-                mSeekBars[i] = new GammaSeekBar(seekBar, valueDisplay, FILE_PATH[i], OFFSET_VALUE, MAX_VALUE);
-            else
-                mSeekBars[i] = new GammaSeekBar(seekBar, valueDisplay, FILE_PATH[i], 0, 10);
-        }
-        SetupButtonClickListeners(view);
-    }
-
-    private void SetupButtonClickListeners(View view) {
-            Button mDefaultButton = (Button)view.findViewById(R.id.btnGammaDefault);
-            Button mCMButton = (Button)view.findViewById(R.id.btnGammaCM);
-            Button mBrightButton = (Button)view.findViewById(R.id.btnGammaBright);
-            mDefaultButton.setOnClickListener(this);
-            mCMButton.setOnClickListener(this);
-            mBrightButton.setOnClickListener(this);
-    }
-
-    @Override
-    protected void onDialogClosed(boolean positiveResult) {
-        super.onDialogClosed(positiveResult);
-
-        sInstances--;
-
-        if (positiveResult) {
-            for (GammaSeekBar csb : mSeekBars) {
-                csb.save();
-            }
-        } else if (sInstances == 0) {
-            for (GammaSeekBar csb : mSeekBars) {
-                csb.reset();
-            }
-        }
-    }
-
-    /**
-     * Restore screen color tuning from SharedPreferences. (Write to kernel.)
-     * 
-     * @param context The context to read the SharedPreferences from
-     */
-    public static void restore(Context context) {
-        if (!isSupported()) {
-            return;
-        }
-
-        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-
-        Boolean bFirstTime = sharedPrefs.getBoolean("FirstTimeGamma", true);
-        for (String filePath : FILE_PATH) {
-            String sDefaultValue = Utils.readOneLine(filePath);
-            int iValue = sharedPrefs.getInt(filePath, Integer.valueOf(sDefaultValue));
-            if (bFirstTime)
-                Utils.writeValue(filePath, "0");
-            else
-                Utils.writeValue(filePath, String.valueOf((long) iValue));
-        }
-        if (bFirstTime)
-        {
-            SharedPreferences.Editor editor = sharedPrefs.edit();
-            editor.putBoolean("FirstTimeGamma", false);
-            editor.commit();
-        }
-    }
-
-    /**
-     * Check whether the running kernel supports color tuning or not.
-     * 
-     * @return Whether color tuning is supported or not
-     */
-    public static boolean isSupported() {
-        boolean supported = true;
-        for (String filePath : FILE_PATH) {
-            if (!Utils.fileExists(filePath)) {
-                supported = false;
-            }
-        }
-
-        return supported;
-    }
-
-    class GammaSeekBar implements SeekBar.OnSeekBarChangeListener {
-
-        private String mFilePath;
-
-        private int mOriginal;
-
-        private SeekBar mSeekBar;
-
-        private TextView mValueDisplay;
-
-        private int iOffset;
-
-        private int iMax;
-
-        public GammaSeekBar(SeekBar seekBar, TextView valueDisplay, String filePath, Integer offsetValue, Integer maxValue) {
-            int iValue;
-
-            mSeekBar = seekBar;
-            mValueDisplay = valueDisplay;
-            mFilePath = filePath;
-            iOffset = offsetValue;
-            iMax = maxValue;
-
-            SharedPreferences sharedPreferences = getSharedPreferences();
-
-            // Read original value
-            if (Utils.fileExists(mFilePath)) {
-                String sDefaultValue = Utils.readOneLine(mFilePath);
-                iValue = Integer.valueOf(sDefaultValue);
-            } else {
-                iValue = iMax - iOffset;
-            }
-            mOriginal = iValue;
-
-            mSeekBar.setMax(iMax);
-                
-            reset();
-            mSeekBar.setOnSeekBarChangeListener(this);
-        }
-
-        public void reset() {
-            int iValue;
-
-            iValue = mOriginal + iOffset;
-            mSeekBar.setProgress(iValue);
-            updateValue(mOriginal);
-        }
-
-        public void save() {
-            int iValue;
-
-            iValue = mSeekBar.getProgress() - iOffset;
-            Editor editor = getEditor();
-            editor.putInt(mFilePath, iValue);
-            editor.commit();
-        }
-
-        @Override
-        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-            int iValue;
-
-            iValue = progress - iOffset;
-            Utils.writeValue(mFilePath, String.valueOf((long) iValue));
-            updateValue(iValue);
-        }
-
-        @Override
-        public void onStartTrackingTouch(SeekBar seekBar) {
-            // Do nothing
-        }
-
-        @Override
-        public void onStopTrackingTouch(SeekBar seekBar) {
-            // Do nothing
-        }
-
-        private void updateValue(int progress) {
-            mValueDisplay.setText(String.format("%d", (int) progress));
-        }
-
-        public void SetNewValue(int iValue) {
-            mOriginal = iValue;
-            reset();
-        }
-
-    }
-
-    public void onClick(View v) {
-        switch(v.getId()){
-            case R.id.btnGammaDefault:
-                    SetDefaultSettings();
-                    break;
-            case R.id.btnGammaCM:
-                    SetCMSettings();
-                    break;
-            case R.id.btnGammaBright:
-                    SetSBrightSettings();
-                    break;
-        }
-    }
-
-    private void SetCMSettings() {
-        mSeekBars[0].SetNewValue(2);
-        mSeekBars[1].SetNewValue(15);
-        mSeekBars[2].SetNewValue(5);
-        mSeekBars[3].SetNewValue(8);
-    }
-
-    private void SetSBrightSettings() {
-        mSeekBars[0].SetNewValue(6);
-        mSeekBars[1].SetNewValue(25);
-        mSeekBars[2].SetNewValue(7);
-        mSeekBars[3].SetNewValue(4);
-    }
-
-    private void SetDefaultSettings() {
-        mSeekBars[0].SetNewValue(0);
-        mSeekBars[1].SetNewValue(0);
-        mSeekBars[2].SetNewValue(0);
-        mSeekBars[3].SetNewValue(0);
-    }
-
-}
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java b/GNexusParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java
deleted file mode 100644
index 17644e6b..00000000
--- a/GNexusParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2011 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.
- */
-
-package com.cyanogenmod.settings.device;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
-import android.util.Log;
-import android.view.View;
-
-import com.cyanogenmod.settings.device.R;
-
-public class GeneralFragmentActivity extends PreferenceFragment {
-
-    private static final String PREF_ENABLED = "1";
-    private static final String TAG = "GNexusParts_General";
-    private static final String USB_FAST_CHARGE_FILE = "/sys/kernel/fast_charge/force_fast_charge";
-
-    private CheckBoxPreference mUSBFastCharge;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.general_preferences);
-
-        PreferenceScreen prefSet = getPreferenceScreen();
-        mUSBFastCharge = (CheckBoxPreference) findPreference(DeviceSettings.KEY_USB_FAST_CHARGE);
-
-        if (isSupported(USB_FAST_CHARGE_FILE)) {
-            mUSBFastCharge.setChecked(PREF_ENABLED.equals(Utils.readOneLine(USB_FAST_CHARGE_FILE)));
-        } else {
-            mUSBFastCharge.setEnabled(false);
-        }
-
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-
-        String boxValue;
-        String key = preference.getKey();
-
-        Log.w(TAG, "key: " + key);
-
-        if (key.equals(DeviceSettings.KEY_USB_FAST_CHARGE)) {
-            final CheckBoxPreference chkPref = (CheckBoxPreference) preference;
-            boxValue = chkPref.isChecked() ? "1" : "0";
-            Utils.writeValue(USB_FAST_CHARGE_FILE, boxValue);
-        }
-
-        return true;
-    }
-
-    public static boolean isSupported(String FILE) {
-        return Utils.fileExists(FILE);
-    }
-
-    public static void restore(Context context) {
-        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-        if (isSupported(USB_FAST_CHARGE_FILE)) {
-            String sDefaultValue = Utils.readOneLine(USB_FAST_CHARGE_FILE);
-            Utils.writeValue(USB_FAST_CHARGE_FILE, sharedPrefs.getBoolean(DeviceSettings.KEY_USB_FAST_CHARGE,
-                             PREF_ENABLED.equals(sDefaultValue)));
-        }
-    }
-}
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/Hspa.java b/GNexusParts/src/com/cyanogenmod/settings/device/Hspa.java
deleted file mode 100644
index cc47307d..00000000
--- a/GNexusParts/src/com/cyanogenmod/settings/device/Hspa.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.cyanogenmod.settings.device;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.SystemProperties;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.PreferenceManager;
-
-public class Hspa implements OnPreferenceChangeListener {
-
-    private static final String APK_FILE = "/system/app/SamsungServiceMode.apk";
-    private static final String HSPA_PROP = "ro.gnexusparts.rild.hspa";
-    private static final String HSPA_PROP_ENABLED = "1";
-
-    private Context mCtx;
-
-    public Hspa(Context context) {
-        mCtx = context;
-    }
-
-    public static boolean isSupported() {
-        String mHspa = SystemProperties.get(HSPA_PROP,"0");
-        if (mHspa.equals(HSPA_PROP_ENABLED)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Restore HSPA setting from SharedPreferences. (Write to kernel.)
-     * @param context       The context to read the SharedPreferences from
-     */
-    public static void restore(Context context) {
-        if (!isSupported()) {
-            return;
-        }
-
-        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-        sendIntent(context, sharedPrefs.getString(DeviceSettings.KEY_HSPA, "23"));
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        sendIntent(mCtx, (String) newValue);
-        return true;
-    }
-
-    private static void sendIntent(Context context, String value) {
-        Intent i = new Intent("com.cyanogenmod.SamsungServiceMode.EXECUTE");
-        i.putExtra("sub_type", 20); // HSPA Setting
-        i.putExtra("data", value);
-        context.sendBroadcast(i);
-    }
-}
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/Startup.java b/GNexusParts/src/com/cyanogenmod/settings/device/Startup.java
deleted file mode 100644
index 302e9510..00000000
--- a/GNexusParts/src/com/cyanogenmod/settings/device/Startup.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.cyanogenmod.settings.device;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-public class Startup extends BroadcastReceiver {
-
-    @Override
-    public void onReceive(final Context context, final Intent bootintent) {
-        ColorTuningPreference.restore(context);
-        GammaTuningPreference.restore(context);
-        GeneralFragmentActivity.restore(context);
-        if (Hspa.isSupported()) {
-            Hspa.restore(context);
-        }
-    }
-}
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/Utils.java b/GNexusParts/src/com/cyanogenmod/settings/device/Utils.java
deleted file mode 100644
index dbf2947c..00000000
--- a/GNexusParts/src/com/cyanogenmod/settings/device/Utils.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (C) 2011 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.
- */
-
-package com.cyanogenmod.settings.device;
-
-import android.util.Log;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.SyncFailedException;
-
-public class Utils {
-    private static final String TAG = "GNexusParts_Utils";
-    private static final String TAG_READ = "GNexusParts_Utils_Read";
-    private static final String TAG_WRITE = "GNexusParts_Utils_Write";
-
-    /**
-     * Write a string value to the specified file.
-     * 
-     * @param filename The filename
-     * @param value The value
-     */
-    public static void writeValue(String filename, String value) {
-        FileOutputStream fos = null;
-        try {
-            fos = new FileOutputStream(new File(filename), false);
-            fos.write(value.getBytes());
-            fos.flush();
-            // fos.getFD().sync();
-        } catch (FileNotFoundException ex) {
-            Log.w(TAG, "file " + filename + " not found: " + ex);
-        } catch (SyncFailedException ex) {
-            Log.w(TAG, "file " + filename + " sync failed: " + ex);
-        } catch (IOException ex) {
-            Log.w(TAG, "IOException trying to sync " + filename + ": " + ex);
-        } catch (RuntimeException ex) {
-            Log.w(TAG, "exception while syncing file: ", ex);
-        } finally {
-            if (fos != null) {
-                try {
-                    Log.w(TAG_WRITE, "file " + filename + ": " + value);
-                    fos.close();
-                } catch (IOException ex) {
-                    Log.w(TAG, "IOException while closing synced file: ", ex);
-                } catch (RuntimeException ex) {
-                    Log.w(TAG, "exception while closing file: ", ex);
-                }
-            }
-        }
-
-    }
-
-    /**
-     * Write a string value to the specified file.
-     * 
-     * @param filename The filename
-     * @param value The value
-     */
-    public static void writeValue(String filename, Boolean value) {
-        FileOutputStream fos = null;
-        String sEnvia;
-        try {
-            fos = new FileOutputStream(new File(filename), false);
-            if (value)
-                sEnvia = "1";
-            else
-                sEnvia = "0";
-            fos.write(sEnvia.getBytes());
-            fos.flush();
-            // fos.getFD().sync();
-        } catch (FileNotFoundException ex) {
-            Log.w(TAG, "file " + filename + " not found: " + ex);
-        } catch (SyncFailedException ex) {
-            Log.w(TAG, "file " + filename + " sync failed: " + ex);
-        } catch (IOException ex) {
-            Log.w(TAG, "IOException trying to sync " + filename + ": " + ex);
-        } catch (RuntimeException ex) {
-            Log.w(TAG, "exception while syncing file: ", ex);
-        } finally {
-            if (fos != null) {
-                try {
-                    Log.w(TAG_WRITE, "file " + filename + ": " + value);
-                    fos.close();
-                } catch (IOException ex) {
-                    Log.w(TAG, "IOException while closing synced file: ", ex);
-                } catch (RuntimeException ex) {
-                    Log.w(TAG, "exception while closing file: ", ex);
-                }
-            }
-        }
-    }
-
-    /**
-     * Write the "color value" to the specified file. The value is scaled from
-     * an integer to an unsigned integer by multiplying by 2.
-     * 
-     * @param filename The filename
-     * @param value The value of max value Integer.MAX
-     */
-    public static void writeColor(String filename, int value) {
-        writeValue(filename, String.valueOf((long) value * 2));
-    }
-
-    /**
-     * Check if the specified file exists.
-     * 
-     * @param filename The filename
-     * @return Whether the file exists or not
-     */
-    public static boolean fileExists(String filename) {
-        return new File(filename).exists();
-    }
-
-    // Read value from sysfs interface
-    public static String readOneLine(String sFile) {
-        BufferedReader brBuffer;
-        String sLine = null;
-
-        try {
-            brBuffer = new BufferedReader(new FileReader(sFile), 512);
-            try {
-                sLine = brBuffer.readLine();
-            } finally {
-                Log.w(TAG_READ, "file " + sFile + ": " + sLine);
-                brBuffer.close();
-            }
-        } catch (Exception e) {
-            Log.e(TAG_READ, "IO Exception when reading /sys/ file", e);
-        }
-        return sLine;
-    }
-}
diff --git a/device.mk b/device.mk
index a794ce88..3af81841 100644
--- a/device.mk
+++ b/device.mk
@@ -54,9 +54,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
 	tuna_hdcp_keys
 
-PRODUCT_PACKAGES += \
-        GNexusParts
-
 PRODUCT_COPY_FILES := \
 	$(LOCAL_KERNEL):kernel \
 	device/samsung/tuna/init.tuna.rc:root/init.tuna.rc \
diff --git a/init.tuna.rc b/init.tuna.rc
index 2cd5aa0b..70f1cbe3 100755
--- a/init.tuna.rc
+++ b/init.tuna.rc
@@ -71,9 +71,6 @@ on fs
     chmod 0777 /dev/tiler
     chmod 0777 /dev/dmm
 
-# change permissions for gamma settings
-    chmod 0666 /sys/devices/platform/omapdss/manager0/gamma
-
 # change permissions for ION driver
     chmod 0777 /dev/ion