diff --git a/configs/perf/perfboostsconfig.xml b/configs/perf/perfboostsconfig.xml
deleted file mode 100755
index 586c0fc..0000000
--- a/configs/perf/perfboostsconfig.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-/* Copyright (c) 2018 Qualcomm Technologies, Inc.
- * All Rights Reserved.
- * Confidential and Proprietary - Qualcomm Technologies, Inc.
-*/
--->
-
-
-<!--Ids are used in identifying the boosts, increment ids linearly,
-    do not modify Ids, or add in between-->
-<!--follow the number format rules while specifying number, can be given
-    in any format-->
-
-<BoostConfigs>
-    <PerfBoost>
-
-    <!--app lauch boost-->
-        <!-- SCHED DOWNMIGRATE resource opcode, value-->
-        <!-- SCHED UPMIGRATE resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-
-        <!-- Type="1", main launch boost of 2sec -->
-        <Config
-            Id="0x00001081" Type="1" Enable="true" Timeout="2000" Target="msmsteppe"
-            Resources="0x40C20000, 0x28, 0x40C1C000, 0x32, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 1516,
-                       0x40800100, 1516" />
-       <Config
-           Id="0x00001081" Type="1" Enable="true" Timeout="2000" Target="sdmmagpie"
-           Resources="0x40C20000, 0x28, 0x40C1C000, 0x32, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 0xFFF,
-                      0x40800100, 0xFFF" />
-
-    <!--app lauch boost (disabling packing)-->
-        <!-- POWER COLLAPSE resource opcode, value-->
-        <!-- STORAGE CLK SCALING resource opcode, value-->
-        <!-- CPUBW_MIN_FREQ resource opcode, value-->
-        <!-- LLCCBW resource opcode, value-->
-        <!-- L3 resource opcode, value-->
-        <!-- GPU nap resource opcode, value-->
-
-        <!-- Type="2", launch boost for disable packing 1.5sec -->
-        <Config
-            Id="0x00001081" Type="2" Enable="true" Timeout="1500" Target="msmsteppe"
-            Resources="0x40400000, 0x1, 0x42C10000, 0x1, 0x43010000, 59,
-                       0x41828000, 806, 0x43400000, 1190, 0x4281C000, 1500" />
-
-       <Config
-           Id="0x00001081" Type="2" Enable="true" Timeout="1500" Target="sdmmagpie"
-           Resources="0x40400000, 0x1, 0x42C10000, 0x1, 0x43010000, 59,
-                      0x41828000, 806, 0x43400000, 1190, 0x4281C000, 1500" />
-
-    <!--app resume boost-->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-
-        <!-- Type="1", main launch boost of 2sec -->
-        <Config
-            Id="0x00001082" Type="1" Enable="true" Timeout="400" Target="sdmmagpie"
-            Resources="0x40C20000, 0x28, 0x40C1C000, 0x32, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 0xFFF,
-                       0x40800100, 0xFFF" />
-
-    <!-- config_enableLaunchBoostv3-->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- SCHED GROUP DOWNMIGRATE resource opcode, value-->
-        <!-- SCHED GROUP UPMIGRATE resource opcode, value-->
-        <!-- LPM Bias resource opcode, value-->
-
-        <!-- Type="3", FA launch boost of 15sec -->
-        <Config
-            Id="0x00001081" Type="3" Enable="true" Timeout="15000" Target="msmsteppe"
-           Resources="0x40C00000, 0x3, 0x40C58000, 95, 0x40C54000, 100, 0x40408000, 0x63" />
-
-       <Config
-           Id="0x00001081" Type="3" Enable="true" Timeout="15000" Target="sdmmagpie"
-          Resources="0x40C00000, 0x3, 0x40C58000, 95, 0x40C54000, 100, 0x40408000, 0x63" />
-
-     <!-- config_gameBoost-->
-         <!-- SCHEDBOOST resource opcode, value-->
-         <!-- SCHED GROUP DOWNMIGRATE resource opcode, value-->
-         <!-- SCHED GROUP UPMIGRATE resource opcode, value-->
-         <!-- LPM Bias resource opcode, value-->
-
-         <!-- Type="4", FA launch boost of 15sec -->
-         <Config
-             Id="0x00001081" Type="4" Enable="true" Timeout="15000" Target="msmsteppe"
-            Resources="0x40C00000, 0x3, 0x40C58000, 95, 0x40C54000, 100, 0x40408000, 0x63" />
-
-        <Config
-            Id="0x00001081" Type="4" Enable="true" Timeout="15000" Target="sdmmagpie"
-           Resources="0x40C00000, 0x3, 0x40C58000, 95, 0x40C54000, 100, 0x40408000, 0x63" />
-
-    <!-- config_enableLaunchBoostv5-->
-        <!-- MIN_ONLINE_CPU_CLUSTER_BIG resource opcode, value-->
-        <!-- MIN_ONLINE_CPU_CLUSTER_LITTLE resource opcode, value-->
-        <!-- GO_HISPEED_LOAD_INTERACTIVE_CLUSTER_BIG resource opcode, value-->
-        <!-- GO_HISPEED_LOAD_INTERACTIVE_CLUSTER_LITTLE resource opcode, value-->
-        <!-- HISPEED_FREQ_INTERACTIVE_CLUSTER_BIG resource opcode, value-->
-        <!-- HISPEED_FREQ_INTERACTIVE_CLUSTER_LITTLE resource opcode, value-->
-        <!-- SCHED DOWNMIGRATE resource opcode, value-->
-        <!-- SCHED UPMIGRATE resource opcode, value-->
-        <!-- L2_MEMLAT_RATIO_CEIL_0 resource opcode, value-->
-        <!-- L2_MEMLAT_RATIO_CEIL_1 resource opcode, value-->
-        <!-- LPM_LEVELS_REF_STDDEV resource opcode, value-->
-        <!-- LPM_LEVELS_TMR_ADD resource opcode, value-->
-
-        <!-- Type="5", Adaptive Launch boost -->
-        <Config
-            Id="0x00001081" Type="5" Enable="true" Timeout="2000" Target="msmsteppe"
-            Resources="0x41000100, 0x4, 0x41000000, 0x4,
-                       0x41440000, 0x28, 0x41440100, 0x28,
-                       0x4143C000, 0xFFF, 0x4143C100, 0xFFF,
-                       0x40C20000, 0x28, 0x40C1C000, 0x32,
-                       0x43404000, 0x2710, 0x43408000, 0x2710,
-                       0x4040C000, 0x1F4, 0x40410000, 0x3E8" />
-
-       <Config
-           Id="0x00001081" Type="5" Enable="true" Timeout="2000" Target="sdmmagpie"
-           Resources="0x41000100, 0x4, 0x41000000, 0x4,
-                      0x41440000, 0x28, 0x41440100, 0x28,
-                      0x4143C000, 0xFFF, 0x4143C100, 0xFFF,
-                      0x40C20000, 0x28, 0x40C1C000, 0x32,
-                      0x43404000, 0x2710, 0x43408000, 0x2710,
-                      0x4040C000, 0x1F4, 0x40410000, 0x3E8" />
-
-     <!-- config_enableLaunchBoost6-->
-        <!-- LPM_BIAS resource opcode, val ms-->
-        <!-- SLB_BIG, val, SLB_BIG, val-->
-        <!-- SLB_LITTLE, val, SLB_LITTLE, val, SLB_LITTLE, val, SLB_LITTLE, val, SLB_LITTLE, val, SLB_LITTLE, val -->
-        <!-- MIN_FREQ_BIG, val MHz -->
-        <!-- CPU_DOWN_FREQ_THRESHOLD_US, val us -->
-
-        <!-- Type="6", Game Launch boost -->
-        <Config
-            Id="0x00001081" Type="6" Enable="true" Timeout="2000" Target="msmsteppe"
-            Resources="0x40408000, 0x5,
-                       0x40C68000, 60, 0x40C68010, 60,
-                       0x40C68100, 33, 0x40C68110, 33, 0x40C68120, 33, 0x40C68130, 33, 0x40C68140, 33, 0x40C68150, 33,
-                       0x40800000, 1363,
-                       0x41448000, 20000 "/>
-
-        <Config
-            Id="0x00001081" Type="6" Enable="true" Timeout="2000" Target="sdmmagpie"
-            Resources="0x40408000, 0x5,
-                       0x40C68000, 60, 0x40C68010, 60,
-                       0x40C68100, 33, 0x40C68110, 33, 0x40C68120, 33, 0x40C68130, 33, 0x40C68140, 33, 0x40C68150, 33,
-                       0x40800000, 1324,
-                       0x41448000, 20000 "/>
-
-    <!--Animation boost -->
-        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <Config
-            Id="0x00001083" Enable="true" Timeout="400" Target="msmsteppe"
-            Resources="0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 2208, 0x40800100, 1708" />
-
-       <Config
-           Id="0x00001083" Enable="true" Timeout="400" Target="sdmmagpie"
-           Resources="0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 2438, 0x40800100, 1804" />
-
-    <!--Vertical Scroll boost-->
-        <!-- CPUBW_MIN_FREQ resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
-        <!-- SCHEDBOOST resource opcode, value-->
-
-        <!-- Type="1", Vertical Scroll boost -->
-        <Config
-            Id="0x00001080" Type="1" Enable="true" Target="msmsteppe"
-            Resources="0x43010000, 0x26, 0x40800000, 1017, 0x40800100, 1100, 0x40C00000, 2" />
-
-        <Config
-            Id="0x00001080" Type="1" Enable="true" Target="sdmmagpie"
-            Resources="0x43010000, 0x26, 0x40800000, 0xFFF, 0x40800100, 1248, 0x40C00000, 2" />
-
-    <!--Horizontal Scroll boost-->
-        <!-- CPUBW_MIN_FREQ resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
-        <!-- SCHEDBOOST resource opcode, value-->
-
-        <!-- Type="2", Horizontal Scroll boost -->
-        <Config
-            Id="0x00001080" Type="2" Enable="true" Target="msmsteppe"
-            Resources="0x43010000, 0x26, 0x40800000, 1017, 0x40800100, 1100, 0x40C00000, 2" />
-
-        <Config
-            Id="0x00001080" Type="2" Enable="true" Target="sdmmagpie"
-            Resources="0x43010000, 0x26, 0x40800000, 0xFFF, 0x40800100, 1248, 0x40C00000, 2" />
-
-    <!--Pre-Fling boost-->
-        <!-- CPUBW_MIN_FREQ resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
-        <!-- SCHEDBOOST resource opcode, value-->
-
-        <!-- Type="4", Pre-Fling boost -->
-        <Config
-            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="msmsteppe"
-            Resources="0x43010000, 0x26, 0x40800000, 1017, 0x40800100, 1100, 0x40C00000, 2" />
-
-        <Config
-            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="sdmmagpie"
-            Resources="0x43010000, 0x26, 0x40800000, 0xFFF, 0x40800100, 1248, 0x40C00000, 2" />
-
-    <!--MTP boost-->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBW_MIN_FREQ resource opcode, value-->
-        <!-- DISABLE_POWER_COLLAPSE resource opcode, value-->
-        <!-- STORAGE CLK SCALING resource opcode, value-->
-
-        <!-- Type="", MTP boost -->
-
-        <Config
-            Id="0x00001086" Enable="true" Target="msmsteppe"
-            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 1516,
-                       0x40800100, 1516, 0x42C10000, 0x1" />
-
-        <Config
-            Id="0x00001086" Enable="true" Target="sdmmagpie"
-            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 0xFFF,
-                       0x40800100, 0xFFF, 0x41800000, 140, 0x40400000, 0x1, 0x42C10000, 0x1" />
-
-    <!--PackageInstall boost-->
-        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- SCHED_SYNC_HINT_ENABLE resource opcode, value-->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- Type="", Package Install boost -->
-
-        <Config
-            Id="0x00001088" Enable="true" Target="msmsteppe"
-            Resources="0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 0xFFF,
-                       0x40800100, 0xFFF, 0x40CA0000, 0, 0x40C00000, 2" />
-
-        <Config
-            Id="0x00001088" Enable="true" Target="sdmmagpie"
-            Resources="0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 0xFFF,
-                       0x40800100, 0xFFF, 0x40CA0000, 0, 0x40C00000, 2, 0x41828000, 14236" />
-
-    <!--Rotation latency boost-->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- Type="", Rotation latency boost -->
-
-        <Config
-            Id="0x00001089" Enable="true" Timeout="1500" Target="msmsteppe"
-            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000,0xFFF,
-                       0x40800100,0xFFF" />
-
-        <Config
-            Id="0x00001089" Enable="true" Timeout="1500" Target="sdmmagpie"
-            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000,0xFFF,
-                       0x40800100,0xFFF" />
-
-    <!--Rotation animation boost-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- GPU MIN_FREQUENCY resource opcode,value-->
-        <!-- Type="", Rotation animation boost -->
-
-        <Config
-            Id="0x00001090" Enable="true" Timeout="1000" Target="msmsteppe"
-            Resources="0x40800100, 1000, 0x4280C000, 596" />
-
-        <Config
-            Id="0x00001090" Enable="true" Timeout="1000" Target="sdmmagpie"
-            Resources="0x40800100, 1209, 0x4280C000, 800" />
-
-    <!--Drag boost-->
-        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
-
-         <!-- Type="1", Drag boost -->
-         <Config
-             Id="0x00001087" Type="1" Enable="true" Timeout="0" Target="sdmmagpie"
-             Resources="0x40800000, 1324, 0x40800100, 1248" />
-
-    <!--Display on Resource -->
-        <!-- Display on resource opcode, value -->
-        <Config
-                Id="0x00001041" Enable="true" Timeout="0" Target="msmsteppe"
-                Resources="0x40000000, 1" />
-        <Config
-                Id="0x00001041" Enable="true" Timeout="0" Target="sdmmagpie"
-                Resources="0x40000000, 1" />
-    <!--Display off Resource -->
-        <!-- Display on resource opcode, value -->
-        <Config
-                Id="0x00001040" Enable="true" Timeout="0" Target="msmsteppe"
-                Resources="0x40000000, 0x0" />
-        <Config
-                Id="0x00001040" Enable="true" Timeout="0" Target="sdmmagpie"
-                Resources="0x40000000, 0x0" />
-
-    <!--XiaoMi bluetooth boost-->
-        <!-- SCHED DOWNMIGRATE resource opcode, value-->
-        <!-- SCHED UPMIGRATE resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-
-        <!-- Type="1", bluetooth boost of 3sec -->
-        <Config
-            Id="0x00011C0" Type="1" Enable="true" Timeout="3000" Target="msmsteppe"
-            Resources="0x40400000, 0x1, 0x40C20000, 0x28, 0x40C1C000, 0x32, 0x40804000, 0xFFF,
-                       0x40804100, 0xFFF, 0x40800000, 1516, 0x40800100, 1516" />
-       <Config
-           Id="0x00011C0" Type="1" Enable="true" Timeout="3000" Target="sdmmagpie"
-           Resources="0x40400000, 0x1, 0x40C20000, 0x28, 0x40C1C000, 0x32, 0x40804000, 0xFFF,
-                      0x40804100, 0xFFF, 0x40800000, 0xFFF, 0x40800100, 0xFFF" />
-    </PerfBoost>
-</BoostConfigs>
diff --git a/configs/perf/perfconfigstore.xml b/configs/perf/perfconfigstore.xml
deleted file mode 100755
index 1319e9b..0000000
--- a/configs/perf/perfconfigstore.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2019 Qualcomm Technologies, Inc.
- * All Rights Reserved.
- * Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-
-<!-- This is PerfConfigsStore file which returns the value when a
-particular property name is invoked -->
-
-<!-- This file supports only Prop tag, which has the following fields
-* Name, to identify the name of the property. The names of the
-properties have been classified into Vendor and System property.
-* Value, the new value to be returned as string when respective
-property Name is called. -->
-
-<PerfConfigsStore>
-    <PerfConfigs>
-
-                <!--Vendor Properties -->
-                <Prop Name="vendor.debug.enable.lm" Value="true" />
-                <Prop Name="vendor.iop.enable_iop" Value="0" />
-                <Prop Name="vendor.iop.enable_uxe" Value="0" />
-                <Prop Name="vendor.enable.prefetch" Value="false" />
-                <Prop Name="vendor.iop.enable_prefetch_ofr" Value="false" />
-                <Prop Name="vendor.perf.iop_v3.enable" Value="false" />
-                <Prop Name="vendor.perf.iop_v3.enable.debug" Value="false" />
-
-                <!--System Properties -->
-                <Prop Name="vendor.perf.gestureflingboost.enable" Value="true" />
-                <Prop Name="ro.vendor.at_library" Value="libqti-at.so" />
-                <Prop Name="ro.lmk.enable_userspace_lmk" Value="false" />
-                <Prop Name="vendor.appcompact.enable_app_compact" Value="false" />
-
-    </PerfConfigs>
-</PerfConfigsStore>
diff --git a/device.mk b/device.mk
index 8935c63..409c19c 100644
--- a/device.mk
+++ b/device.mk
@@ -83,8 +83,6 @@ PRODUCT_PACKAGES += \
 
 # Power
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/perf/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml \
-    $(LOCAL_PATH)/configs/perf/perfconfigstore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfconfigstore.xml \
     $(LOCAL_PATH)/configs/power/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
 
 # Sensors