diff --git a/apq8064-tabla-snd-card_Button_Jack.kl b/apq8064-tabla-snd-card_Button_Jack.kl
index 421b5b8..504e307 100644
--- a/apq8064-tabla-snd-card_Button_Jack.kl
+++ b/apq8064-tabla-snd-card_Button_Jack.kl
@@ -1 +1 @@
-key 256   HEADSETHOOK       WAKE
+key 256   HEADSETHOOK
diff --git a/hs_detect.kl b/hs_detect.kl
index 7fb56ab..0492203 100644
--- a/hs_detect.kl
+++ b/hs_detect.kl
@@ -1,4 +1,4 @@
-key 226   HEADSETHOOK       WAKE
-key 116   POWER             WAKE
-key 107   ENDCALL           WAKE_DROPPED
+key 226   HEADSETHOOK
+key 116   POWER
+key 107   ENDCALL
 
diff --git a/keypad_8064.kl b/keypad_8064.kl
index 03ac948..1a08304 100644
--- a/keypad_8064.kl
+++ b/keypad_8064.kl
@@ -1,2 +1,2 @@
-key 114   VOLUME_DOWN   WAKE
-key 115   VOLUME_UP     WAKE
+key 114   VOLUME_DOWN
+key 115   VOLUME_UP
diff --git a/pmic8xxx_pwrkey.kl b/pmic8xxx_pwrkey.kl
index 469d742..50fe058 100644
--- a/pmic8xxx_pwrkey.kl
+++ b/pmic8xxx_pwrkey.kl
@@ -1 +1 @@
-key 116   POWER     WAKE
+key 116   POWER