diff --git a/keylayout/atmel_mxt_ts.kl b/keylayout/atmel_mxt_ts.kl
deleted file mode 100644
index 2f364b2..0000000
--- a/keylayout/atmel_mxt_ts.kl
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2012, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-
-key 139    MENU
-key 102    HOME
-key 158    BACK
-key 217    SEARCH
diff --git a/keylayout/gpio-keys.kl b/keylayout/gpio-keys.kl
index ebe5cfe..0a16735 100644
--- a/keylayout/gpio-keys.kl
+++ b/keylayout/gpio-keys.kl
@@ -29,8 +29,7 @@ key 114   VOLUME_DOWN       WAKE_DROPPED
 key 172   HOME              WAKE_DROPPED
 key 528   FOCUS             WAKE_DROPPED
 key 766   CAMERA            WAKE_DROPPED
-key 116	  POWER             WAKE_DROPPED
+key 116   POWER             WAKE_DROPPED
 key 139   MENU
 key 158   BACK
-key 252   ACTIVE
 key 254   APP_SWITCH
diff --git a/keylayout/sec_navigation.kl b/keylayout/sec_navigation.kl
deleted file mode 100644
index 300fe8a..0000000
--- a/keylayout/sec_navigation.kl
+++ /dev/null
@@ -1,2 +0,0 @@
-key 560   FINGER_DETECTED
-key 561	  FINGER_REMOVED
diff --git a/keylayout/sec_touchscreen.kl b/keylayout/sec_touchscreen.kl
deleted file mode 100644
index 3f26d66..0000000
--- a/keylayout/sec_touchscreen.kl
+++ /dev/null
@@ -1,9 +0,0 @@
-key	744	SIDE_TOUCH_0
-key	745	SIDE_TOUCH_1
-key	746	SIDE_TOUCH_2
-key	747	SIDE_TOUCH_3
-key	748	SIDE_TOUCH_4
-key	749	SIDE_TOUCH_5
-key	750	SIDE_TOUCH_6
-key	751	SIDE_TOUCH_7
-key	752	SIDE_CAMERA_DETECTED
diff --git a/keylayout/synaptics_rmi4_i2c.kl b/keylayout/synaptics_rmi4_i2c.kl
deleted file mode 100644
index 2f364b2..0000000
--- a/keylayout/synaptics_rmi4_i2c.kl
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2012, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-
-key 139    MENU
-key 102    HOME
-key 158    BACK
-key 217    SEARCH