diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk
index 0d84bcb..540f12e 100644
--- a/BoardCommonConfig.mk
+++ b/BoardCommonConfig.mk
@@ -18,8 +18,6 @@
 # This variable is set first, so it can be overridden
 # by BoardConfigVendor.mk
 BOARD_USES_GENERIC_AUDIO := false
-BOARD_USE_SAMSUNG_COLORFORMAT := true
-USE_SAMSUNG_COLORFORMAT := true
 BOARD_USES_LEGACY_MMAP := true
 TARGET_CPU_ABI := armeabi-v7a
 TARGET_CPU_ABI2 := armeabi
diff --git a/res/charger/battery_0.png b/res/charger/battery_0.png
deleted file mode 100644
index 38b888c..0000000
Binary files a/res/charger/battery_0.png and /dev/null differ
diff --git a/res/charger/battery_1.png b/res/charger/battery_1.png
deleted file mode 100644
index 03f4226..0000000
Binary files a/res/charger/battery_1.png and /dev/null differ
diff --git a/res/charger/battery_2.png b/res/charger/battery_2.png
deleted file mode 100644
index 296959e..0000000
Binary files a/res/charger/battery_2.png and /dev/null differ
diff --git a/res/charger/battery_3.png b/res/charger/battery_3.png
deleted file mode 100644
index 97a5dfd..0000000
Binary files a/res/charger/battery_3.png and /dev/null differ
diff --git a/res/charger/battery_4.png b/res/charger/battery_4.png
deleted file mode 100644
index 63865c2..0000000
Binary files a/res/charger/battery_4.png and /dev/null differ
diff --git a/res/charger/battery_5.png b/res/charger/battery_5.png
deleted file mode 100644
index eec62b0..0000000
Binary files a/res/charger/battery_5.png and /dev/null differ
diff --git a/res/charger/battery_charge.png b/res/charger/battery_charge.png
deleted file mode 100644
index c1d2856..0000000
Binary files a/res/charger/battery_charge.png and /dev/null differ
diff --git a/res/charger/battery_fail.png b/res/charger/battery_fail.png
deleted file mode 100644
index 9099d02..0000000
Binary files a/res/charger/battery_fail.png and /dev/null differ
diff --git a/rootdir/init.smdk4210.rc b/rootdir/init.smdk4210.rc
index f4139e7..4afec6f 100644
--- a/rootdir/init.smdk4210.rc
+++ b/rootdir/init.smdk4210.rc
@@ -329,9 +329,6 @@ on boot
     chmod 0600 /dev/pn544
     chown nfc nfc /dev/pn544
 
-# Device Encryption by B2B Security Lab. 
-    setprop ro.crypto.keyfile.userdata /efs/metadata
-
 # fake some battery state
     setprop status.battery.state Slow
     setprop status.battery.level 5