diff --git a/power/Android.mk b/power/Android.mk
index 662f283..34042ed 100644
--- a/power/Android.mk
+++ b/power/Android.mk
@@ -18,10 +18,6 @@ ifeq ($(TARGET_USES_INTERACTION_BOOST),true)
     LOCAL_CFLAGS += -DINTERACTION_BOOST
 endif
 
-ifneq ($(TARGET_TAP_TO_WAKE_NODE),)
-    LOCAL_CFLAGS += -DTAP_TO_WAKE_NODE=\"$(TARGET_TAP_TO_WAKE_NODE)\"
-endif
-
 LOCAL_MODULE := android.hardware.power@1.2-service
 LOCAL_INIT_RC := android.hardware.power@1.2-service.rc
 LOCAL_MODULE_TAGS := optional
diff --git a/power/Power.cpp b/power/Power.cpp
index b765b7f..81c0a85 100644
--- a/power/Power.cpp
+++ b/power/Power.cpp
@@ -65,7 +65,6 @@ Return<void> Power::powerHint(PowerHint_1_0 hint, int32_t data) {
 }
 
 Return<void> Power::setFeature(Feature feature, bool activate)  {
-    set_feature(static_cast<feature_t>(feature), activate ? 1 : 0);
     return Void();
 }
 
diff --git a/power/power-common.c b/power/power-common.c
index 45b04e7..0101bea 100644
--- a/power/power-common.c
+++ b/power/power-common.c
@@ -133,17 +133,3 @@ void set_interactive(int on)
 
     ALOGI("Got set_interactive hint");
 }
-
-void set_feature(feature_t feature, int state)
-{
-    switch (feature) {
-#ifdef TAP_TO_WAKE_NODE
-        case POWER_FEATURE_DOUBLE_TAP_TO_WAKE:
-            sysfs_write(TAP_TO_WAKE_NODE, state ? "1" : "0");
-            break;
-#endif
-        default:
-            break;
-    }
-}
-
diff --git a/power/power-common.h b/power/power-common.h
index 6abc725..697302a 100644
--- a/power/power-common.h
+++ b/power/power-common.h
@@ -61,7 +61,6 @@ enum CPU_GOV_CHECK {
 void power_init(void);
 void power_hint(power_hint_t hint, void *data);
 void set_interactive(int on);
-void set_feature(feature_t feature, int state);
 
 #ifdef __cplusplus
 }
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 752bb83..529f5a0 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -115,9 +115,9 @@
 /data/system/perfd(/.*)?                                        u:object_r:perfd_data_file:s0
 /data/oemnvitems(/.*)?                                          u:object_r:nv_data_file:s0
 
-/(vendor|system/vendor)/bin/perfd           u:object_r:perfd_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.power@1\.2-service          u:object_r:hal_power_default_exec:s0
-#/(vendor|system/vendor)/radio(/.*)? u:object_r:radio_data_file:s0
+/system/vendor/bin/perfd           u:object_r:perfd_exec:s0
+/system/vendor/bin/hw/android\.hardware\.power@1\.2-service          u:object_r:hal_power_default_exec:s0
+/system/vendor/radio(/.*)? u:object_r:radio_data_file:s0
 
 /system/vendor/bin/qmi_motext_hook u:object_r:rild_exec:s0