diff --git a/power-660.c b/power-660.c
index bf986e2..d5e55d8 100644
--- a/power-660.c
+++ b/power-660.c
@@ -51,7 +51,6 @@
 
 #define MIN_VAL(X,Y) ((X>Y)?(Y):(X))
 
-static int saved_interactive_mode = -1;
 static int display_hint_sent;
 static int video_encode_hint_sent;
 static int cam_preview_hint_sent;
@@ -173,7 +172,6 @@ int  set_interactive_override(int on)
              display_hint_sent = 0;
           }
    }
-    saved_interactive_mode = !!on;
     return HINT_HANDLED;
 }
 
diff --git a/power-8937.c b/power-8937.c
index 5c041f7..3342f13 100644
--- a/power-8937.c
+++ b/power-8937.c
@@ -51,7 +51,6 @@
 
 #define MIN_VAL(X,Y) ((X>Y)?(Y):(X))
 
-static int saved_interactive_mode = -1;
 static int display_hint_sent;
 static int video_encode_hint_sent;
 static void process_video_encode_hint(void *metadata);
@@ -136,7 +135,6 @@ int  set_interactive_override(int on)
              display_hint_sent = 0;
           }
    }
-    saved_interactive_mode = !!on;
 
     set_i_count ++;
     ALOGI("Got set_interactive hint on= %d, count= %d\n", on, set_i_count);
diff --git a/power-8953.c b/power-8953.c
index 2d564f4..28fa620 100644
--- a/power-8953.c
+++ b/power-8953.c
@@ -51,7 +51,6 @@
 
 #define MIN_VAL(X,Y) ((X>Y)?(Y):(X))
 
-static int saved_interactive_mode = -1;
 static int display_hint_sent;
 static int video_encode_hint_sent;
 static int cam_preview_hint_sent;
@@ -138,7 +137,6 @@ int  set_interactive_override(int on)
              display_hint_sent = 0;
           }
    }
-    saved_interactive_mode = !!on;
 
     set_i_count ++;
     ALOGI("Got set_interactive hint on= %d, count= %d\n", on, set_i_count);
diff --git a/power-common.h b/power-common.h
index 73aac20..aa6e681 100644
--- a/power-common.h
+++ b/power-common.h
@@ -36,13 +36,8 @@ extern "C" {
 #define NODE_MAX (64)
 
 #define SCALING_GOVERNOR_PATH "/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor"
-#define DCVS_CPU0_SLACK_MAX_NODE "/sys/module/msm_dcvs/cores/cpu0/slack_time_max_us"
-#define DCVS_CPU0_SLACK_MIN_NODE "/sys/module/msm_dcvs/cores/cpu0/slack_time_min_us"
-#define MPDECISION_SLACK_MAX_NODE "/sys/module/msm_mpdecision/slack_time_max_us"
-#define MPDECISION_SLACK_MIN_NODE "/sys/module/msm_mpdecision/slack_time_min_us"
 #define ONDEMAND_GOVERNOR "ondemand"
 #define INTERACTIVE_GOVERNOR "interactive"
-#define MSMDCVS_GOVERNOR "msm-dcvs"
 #define SCHEDUTIL_GOVERNOR "schedutil"
 
 #define HINT_HANDLED (0)