diff --git a/Android.bp b/Android.bp
index c51a1fe..91e39db 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,6 +3,8 @@
 // This file is generated by device/xiaomi/msm8953-common/setup-makefiles.sh
 
 soong_namespace {
+	imports: [
+	],
 }
 
 cc_prebuilt_library_shared {
diff --git a/msm8953-common-vendor.mk b/msm8953-common-vendor.mk
index 5a54f92..3e08dd5 100644
--- a/msm8953-common-vendor.mk
+++ b/msm8953-common-vendor.mk
@@ -79,14 +79,12 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/cdsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/cdsprpcd \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/cnd:$(TARGET_COPY_OUT_VENDOR)/bin/cnd \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/dpmQmiMgr:$(TARGET_COPY_OUT_VENDOR)/bin/dpmQmiMgr \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/bin/energy-awareness:$(TARGET_COPY_OUT_VENDOR)/bin/energy-awareness \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/hvdcp_opti:$(TARGET_COPY_OUT_VENDOR)/bin/hvdcp_opti \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.bluetooth@1.0-service-qti \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/hw/android.hardware.drm@1.2-service.widevine:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.drm@1.2-service.widevine \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/hw/qcrild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qcrild \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/hw/vendor.display.color@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.display.color@1.0-service \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.alarm@1.0-service \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.perf@2.0-service \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qdutils_disp@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.qdutils_disp@1.0-service-qti \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/ims_rtp_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ims_rtp_daemon \
@@ -164,15 +162,9 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/init/qcrild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qcrild.rc \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/init/vendor.display.color@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.display.color@1.0-service.rc \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.alarm@1.0-service.rc \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.perf@2.0-service.rc \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/init/vendor.qti.hardware.qdutils_disp@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qdutils_disp@1.0-service-qti.rc \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/etc/perf/commonresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonresourceconfigs.xml \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/etc/perf/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/etc/perf/perfconfigstore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfconfigstore.xml \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/etc/perf/targetconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetconfig.xml \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/etc/perf/targetresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetresourceconfigs.xml \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/seccomp_policy/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf \
@@ -265,8 +257,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libmm-color-convertor.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmm-color-convertor.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libmm-hdcpmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmm-hdcpmgr.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libmmosal_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmosal_proprietary.so \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libperfconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfconfig.so \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libperfgluelayer.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfgluelayer.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libperipheral_client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperipheral_client.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libqcci_legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqcci_legacy.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libqdi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqdi.so \
@@ -279,9 +269,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libqmi_csi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_csi.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libqmi_encdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_encdec.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmiservices.so \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libqti-perfd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-perfd-client.so \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libqti-perfd.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-perfd.so \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libqti-util.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-util.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib/libqtigef.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqtigef.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib/librs_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/librs_adreno.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib/librs_adreno_sha1.so:$(TARGET_COPY_OUT_VENDOR)/lib/librs_adreno_sha1.so \
@@ -443,8 +430,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/liboemaids_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liboemaids_vendor.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libpdmapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpdmapper.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libpdnotifier.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpdnotifier.so \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libperfconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperfconfig.so \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libperfgluelayer.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperfgluelayer.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libperipheral_client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperipheral_client.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libqcci_legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcci_legacy.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libqcmaputils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcmaputils.so \
@@ -463,9 +448,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmiservices.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libqrtr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqrtr.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libqsocket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqsocket.so \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libqti-perfd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-perfd-client.so \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libqti-perfd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-perfd.so \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libqti-util.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-util.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libqtigef.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqtigef.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/librcc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librcc.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/lib64/libril-qc-hal-qmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-hal-qmi.so \
diff --git a/proprietary/vendor/bin/energy-awareness b/proprietary/vendor/bin/energy-awareness
deleted file mode 100755
index 76746c6..0000000
Binary files a/proprietary/vendor/bin/energy-awareness and /dev/null differ
diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.0-service b/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.0-service
deleted file mode 100644
index ea2238b..0000000
Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.0-service and /dev/null differ
diff --git a/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.0-service.rc b/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.0-service.rc
deleted file mode 100644
index 618011b..0000000
--- a/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.0-service.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-service perf-hal-2-0 /vendor/bin/hw/vendor.qti.hardware.perf@2.0-service
-    class hal
-    user root
-    group root readproc oem_2907
diff --git a/proprietary/vendor/etc/perf/commonresourceconfigs.xml b/proprietary/vendor/etc/perf/commonresourceconfigs.xml
deleted file mode 100644
index 59f1e04..0000000
--- a/proprietary/vendor/etc/perf/commonresourceconfigs.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Copyright (c) 2017 Qualcomm Technologies, Inc.
- * All Rights Reserved.
- * Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-
-<!-- Supported XML tags with their fields.
- * Major tag supports OpcodeValue.
- * Minor tag supports OpcodeValue, Nodepath and Supported(Optional) fields.
- * By default, all the resources are assumed as supported.
- Supported field can be used to mark a resource as not supported.
- * All the interactive nodes, ondemand nodes and some nodes of sched major
- group which aren't being used are marked as Not supported by default and
- can be enabled by using the target specific config files. -->
-
-<!-- For resources which update multiple nodes or which require speical
-acquire/release funcitons, need to mention the keyword SPECIAL_NODE
-in their node path field and accordingly their ApplyOts and ResetOpts
-functions need to be defined in the code.-->
-
-<!-- For adding a new resource, a new minor tag with all mandatory fields
-need to be added just before the end of it's major group. -->
-
-<ResourceConfigs>
-    <PerfResources>
-
-    <!-- display off major start -->
-    <Major OpcodeValue="0x0" />
-        <Minor OpcodeValue="0x0" Node="SPECIAL_NODE - display_off" />
-    <!-- display off major end -->
-
-    <!-- power collapse major start -->
-    <Major OpcodeValue="0x1" />
-        <Minor OpcodeValue="0x0" Node="/dev/cpu_dma_latency" />
-        <Minor OpcodeValue="0x1" Node="/sys/module/lpm_levels/system/perf/perf-l2-pc/idle_enabled" />
-        <Minor OpcodeValue="0x2" Node="/sys/module/lpm_levels/parameters/bias_hyst" />
-        <Minor OpcodeValue="0x3" Node="/sys/module/lpm_levels/parameters/ref_stddev" />
-        <Minor OpcodeValue="0x4" Node="/sys/module/lpm_levels/parameters/tmr_add" />
-    <!-- power collapse major end -->
-
-    <!-- cpufreq major start -->
-    <Major OpcodeValue="0x2" />
-        <Minor OpcodeValue="0x0" Node="/sys/module/msm_performance/parameters/cpu_min_freq" />
-        <Minor OpcodeValue="0x1" Node="/sys/module/msm_performance/parameters/cpu_max_freq" />
-    <!-- cpufreq major end -->
-
-    <!-- sched major start -->
-    <Major OpcodeValue="0x3" />
-        <!--Sysfsnode paths may change basing on the target for minors 0x1, 0x4, 0x5, 0x9.
-            So, for targets with different node paths than default, need to be specified
-            in the target specific resource config xml file. -->
-        <Minor OpcodeValue="0x0" Node="/proc/sys/kernel/sched_boost" />
-        <Minor OpcodeValue="0x1" Node="/proc/sys/kernel/sched_prefer_idle" Supported="no" />
-        <Minor OpcodeValue="0x2" Node="/proc/sys/kernel/sched_migration_cost_ns" />
-        <Minor OpcodeValue="0x3" Node="/proc/sys/kernel/sched_small_task" />
-        <Minor OpcodeValue="0x4" Node="/proc/sys/kernel/sched_mostly_idle_load" Supported="no" />
-        <Minor OpcodeValue="0x5" Node="/proc/sys/kernel/sched_mostly_idle_nr_run" Supported="no" />
-        <Minor OpcodeValue="0x6" Node="/proc/sys/kernel/sched_init_task_load" />
-        <Minor OpcodeValue="0x7" Node="/proc/sys/kernel/sched_upmigrate" />
-        <Minor OpcodeValue="0x8" Node="/proc/sys/kernel/sched_downmigrate" />
-        <Minor OpcodeValue="0x9" Node="/proc/sys/kernel/sched_mostly_idle_freq" Supported="no" />
-        <Minor OpcodeValue="0xA" Node="SPECIAL_NODE - sched_add_group" />
-        <Minor OpcodeValue="0xB" Node="/proc/sys/kernel/sched_spill_nr_run" />
-        <Minor OpcodeValue="0xC" Node="/sys/devices/system/cpu/cpu0/sched_static_cpu_pwr_cost" />
-        <Minor OpcodeValue="0xD" Node="/proc/sys/kernel/sched_restrict_cluster_spill" />
-        <Minor OpcodeValue="0xE" Node="SPECIAL_NODE - sched_freq_add_group" />
-        <Minor OpcodeValue="0xF" Node="/dev/cpuset/top-app/cpus" />
-        <Minor OpcodeValue="0x10" Node="/dev/cpuset/foreground/cpus" />
-        <Minor OpcodeValue="0x11" Node="/dev/cpuset/system-background/cpus" />
-        <Minor OpcodeValue="0x12" Node="/dev/cpuset/background/cpus" />
-        <Minor OpcodeValue="0x13" Node="/proc/sys/kernel/sched_freq_aggregate" />
-        <Minor OpcodeValue="0x14" Node="/proc/sys/kernel/sched_enable_thread_grouping" />
-        <Minor OpcodeValue="0x15" Node="/proc/sys/kernel/sched_group_upmigrate" />
-        <Minor OpcodeValue="0x16" Node="/proc/sys/kernel/sched_group_downmigrate" />
-        <!-- sched_freq_aggr_threshold perflock will have contention with sched_boost level 3,
-        so disable this resource for the target which is going to use sched boost 3 level.-->
-        <Minor OpcodeValue="0x17" Node="/proc/sys/kernel/sched_freq_aggregate_threshold" />
-        <Minor OpcodeValue="0x18" Node="/dev/stune/top-app/schedtune.prefer_idle" />
-        <Minor OpcodeValue="0x19" Node="/proc/sys/kernel/sched_initial_task_util" />
-        <Minor OpcodeValue="0x1A" Node="/sys/devices/system/cpu/cpu0/sched_load_boost" />
-        <Minor OpcodeValue="0x1B" Node="/proc/sys/kernel/sched_little_cluster_coloc_fmin_khz" />
-        <Minor OpcodeValue="0x1C" Node="/dev/stune/top-app/schedtune.boost" />
-        <Minor OpcodeValue="0x1D" Node="/proc/sys/kernel/sched_busy_hysteresis_enable_cpus" />
-        <Minor OpcodeValue="0x1E" Node="/proc/sys/kernel/sched_min_task_util_for_colocation" />
-        <Minor OpcodeValue="0x1F" Node="/proc/sys/kernel/sched_min_task_util_for_boost" />
-        <Minor OpcodeValue="0x20" Node="/proc/%d/sched_boost" Supported="yes"/> <!-- sched_task_boost -->
-        <Minor OpcodeValue="0x21" Node="/proc/sys/kernel/sched_user_hint" /> <!--sched_user_hint -->
-        <Minor OpcodeValue="0x22" Node="/proc/sys/kernel/sched_task_unfilter_nr_windows" /> <!--sched_task_unfilter_nr_windows -->
-        <Minor OpcodeValue="0x23" Node="/proc/sys/kernel/sched_coloc_downmigrate_ns" /> <!--sched_coloc_downmigrate_ns  -->
-        <Minor OpcodeValue="0x24" Node="/proc/sys/kernel/sched_coloc_busy_hysteresis_enable_cpus" />
-        <Minor OpcodeValue="0x25" Node="/proc/sys/kernel/sched_coloc_busy_hyst_ns" />
-        <Minor OpcodeValue="0x26" Node="/proc/sys/kernel/sched_window_stats_policy" />
-    <!-- sched major end -->
-
-    <!-- core hotplug major start -->
-    <Major OpcodeValue="0x4" />
-        <Minor OpcodeValue="0x0" Node="SPECIAL_NODE - lock_min_cores" />
-        <Minor OpcodeValue="0x1" Node="SPECIAL_NODE - lock_max_cores" />
-    <!-- core hotplug major end-->
-
-    <!-- interactive major start -->
-    <Major OpcodeValue="0x5" />
-        <!-- For following minors node paths might change basing on GovInstanceType and
-        Supported field might change basing on the type of CpufreqGov.-->
-        <Minor OpcodeValue="0x0" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay" Supported="no" />
-        <Minor OpcodeValue="0x1" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/boost" Supported="no" />
-        <Minor OpcodeValue="0x2" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/boostpulse" Supported="no" />
-        <Minor OpcodeValue="0x3" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/boostpulse_duration" Supported="no" />
-        <Minor OpcodeValue="0x4" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/go_hispeed_load" Supported="no" />
-        <Minor OpcodeValue="0x5" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/hispeed_freq" Supported="no" />
-        <Minor OpcodeValue="0x6" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/io_is_busy" Supported="no" />
-        <Minor OpcodeValue="0x7" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/min_sample_time" Supported="no" />
-        <Minor OpcodeValue="0x8" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/target_loads" Supported="no" />
-        <Minor OpcodeValue="0x9" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/timer_rate" Supported="no" />
-        <Minor OpcodeValue="0xA" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/timer_slack" Supported="no" />
-        <Minor OpcodeValue="0xB" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/max_freq_hysteresis" Supported="no" />
-        <Minor OpcodeValue="0xC" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/use_sched_load" Supported="no" />
-        <Minor OpcodeValue="0xD" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/use_migration_notif" Supported="no" />
-        <Minor OpcodeValue="0xE" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/ignore_hispeed_on_notif" Supported="no" />
-        <Minor OpcodeValue="0xF" Node="/sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_freq" />
-        <Minor OpcodeValue="0x10" Node="/sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_load" />
-        <Minor OpcodeValue="0x11" Node="/sys/devices/system/cpu/cpu0/cpufreq/schedutil/pl" />
-        <Minor OpcodeValue="0x12" Node="/sys/devices/system/cpu/cpu0/cpufreq/schedutil/down_rate_limit_us" />
-        <Minor OpcodeValue="0x13" Node="/sys/devices/system/cpu/cpu0/cpufreq/schedutil/rtg_boost_freq" />
-    <!-- interactive major end -->
-
-    <!-- cpubw hwmon major start -->
-    <Major OpcodeValue="0x6" />
-        <!-- ALl the following minors might change based on target. -->
-        <Minor OpcodeValue="0x0" Node="/sys/class/devfreq/soc:qcom,cpubw/min_freq" />
-        <Minor OpcodeValue="0x1" Node="/sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/decay_rate" />
-        <Minor OpcodeValue="0x2" Node="/sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/io_percent" />
-        <Minor OpcodeValue="0x3" Node="SPECIAL_NODE - cpubw_hwmon_hyst_opt" />
-        <Minor OpcodeValue="0x4" Node="/sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/low_power_ceil_mbps" />
-        <Minor OpcodeValue="0x5" Node="/sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/low_power_io_percent" />
-        <Minor OpcodeValue="0x6" Node="/sys/class/devfreq/soc:qcom,cpubw/max_freq" />
-        <Minor OpcodeValue="0x7" Node="/sys/class/devfreq/soc:qcom,cpubw/polling_interval" />
-        <Minor OpcodeValue="0x8" Node="/sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/sample_ms" />
-        <Minor OpcodeValue="0x9" Node="/sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/idle_mbps" />
-        <Minor OpcodeValue="0xA" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/min_freq" />
-        <Minor OpcodeValue="0xB" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/up_scale" />
-    <!-- cpubw hwmon major end -->
-
-    <!-- video major start -->
-    <Major OpcodeValue="0x7" />
-        <Minor OpcodeValue="0x0" Node="SPECIAL_NODE - handle_vid_encplay_hint" />
-        <Minor OpcodeValue="0x1" Node="SPECIAL_NODE - handle_vid_decplay_hint" />
-        <Minor OpcodeValue="0x2" Node="SPECIAL_NODE - handle_disp_hint" />
-    <!-- video major end -->
-
-    <!-- ksm major start -->
-    <Major OpcodeValue="0x8" />
-        <Minor OpcodeValue="0x0" Node="SPECIAL_NODE - disable_ksm" />
-        <Minor OpcodeValue="0x1" Node="SPECIAL_NODE - set_ksm_param" />
-    <!-- ksm major end -->
-
-    <!-- ondemand major start -->
-    <Major OpcodeValue="0x9" />
-        <Minor OpcodeValue="0x0" Node="/sys/devices/system/cpu/cpufreq/ondemand/sampling_rate" Supported="no" />
-        <Minor OpcodeValue="0x1" Node="/sys/devices/system/cpu/cpufreq/ondemand/io_is_busy" Supported="no" />
-        <Minor OpcodeValue="0x2" Node="/sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor" Supported="no" />
-        <Minor OpcodeValue="0x3" Node="/sys/devices/system/cpu/cpufreq/ondemand/sync_freq" Supported="no" />
-        <Minor OpcodeValue="0x4" Node="/sys/devices/system/cpu/cpufreq/ondemand/optimal_freq" Supported="no" />
-        <Minor OpcodeValue="0x5" Node="/sys/devices/system/cpu/cpufreq/ondemand/enable_stepup" Supported="no" />
-        <Minor OpcodeValue="0x6" Node="/sys/devices/system/cpu/cpufreq/ondemand/max_intermediate_steps" Supported="no" />
-        <Minor OpcodeValue="0x7" Node="/dev/cpuctl/cpu.notify_on_migrate" Supported="no" />
-    <!-- ondemand major end -->
-
-    <!-- gpu major start -->
-    <Major OpcodeValue="0xA" />
-        <Minor OpcodeValue="0x0" Node="/sys/class/kgsl/kgsl-3d0/default_pwrlevel" />
-        <Minor OpcodeValue="0x1" Node="/sys/class/kgsl/kgsl-3d0/min_pwrlevel" />
-        <Minor OpcodeValue="0x2" Node="/sys/class/kgsl/kgsl-3d0/max_pwrlevel" />
-        <Minor OpcodeValue="0x3" Node="/sys/class/kgsl/kgsl-3d0/devfreq/min_freq" />
-        <Minor OpcodeValue="0x4" Node="/sys/class/kgsl/kgsl-3d0/devfreq/max_freq" />
-        <Minor OpcodeValue="0x5" Node="/sys/class/devfreq/soc:qcom,gpubw/min_freq" />
-        <Minor OpcodeValue="0x6" Node="/sys/class/devfreq/soc:qcom,gpubw/max_freq" />
-        <Minor OpcodeValue="0x7" Node="SPECIAL_NODE - gpu_disable_gpu_nap" />
-    <!-- gpu major end -->
-
-    <!-- misc major start -->
-    <Major OpcodeValue="0xB" />
-        <Minor OpcodeValue="0x0" Node="SPECIAL_NODE - unsupported" />
-        <Minor OpcodeValue="0x1" Node="SPECIAL_NODE - irq_balancer" />
-        <Minor OpcodeValue="0x2" Node="/sys/module/cpu_boost/parameters/input_boost_freq" />
-        <Minor OpcodeValue="0x3" Node="/proc/sys/vm/swap_ratio" />
-        <Minor OpcodeValue="0x4" Node="StorageNode_path_is_figured_out_based_on_the_target_device" />
-        <Minor OpcodeValue="0x5" Node="SPECIAL_NODE - dummy_or_keep_alive" />
-        <Minor OpcodeValue="0x6" Node="/sys/module/process_reclaim/parameters/enable_process_reclaim" />
-    <!-- misc major end -->
-
-    <!-- llcbw hwmon major start -->
-    <Major OpcodeValue="0xC" />
-        <!-- ALl the following minors node path might change based on target. -->
-        <Minor OpcodeValue="0x0" Node="/sys/class/devfreq/soc:qcom,llccbw/min_freq" />
-        <Minor OpcodeValue="0x1" Node="/sys/class/devfreq/soc:qcom,llccbw/bw_hwmon/io_percent" />
-        <Minor OpcodeValue="0x2" Node="SPECIAL_NODE - llcbw_hwmon_hyst_opt" />
-        <Minor OpcodeValue="0x3" Node="/sys/class/devfreq/soc:qcom,llccbw/bw_hwmon/sample_ms" />
-        <Minor OpcodeValue="0x4" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/min_freq" />
-        <Minor OpcodeValue="0x5" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/up_scale" />
-    <!-- llcbw hwmon major end -->
-
-    <!-- memlat major start -->
-    <Major OpcodeValue="0xD" />
-        <!-- ALl the following minors node path might change based on target. -->
-        <Minor OpcodeValue="0x0" Node="/sys/class/devfreq/soc:qcom,l3-cpu%d/min_freq" />
-        <Minor OpcodeValue="0x1" Node="/sys/class/devfreq/soc:qcom,memlat-cpu0/mem_latency/ratio_ceil" />
-        <Minor OpcodeValue="0x2" Node="/sys/class/devfreq/soc:qcom,memlat-cpu4/mem_latency/ratio_ceil" />
-        <Minor OpcodeValue="0x3" Node="/sys/class/devfreq/soc:qcom,memlat-cpu0/mem_latency/stall_floor" />
-        <Minor OpcodeValue="0x4" Node="/sys/class/devfreq/soc:qcom,memlat-cpu4/mem_latency/stall_floor" />
-        <Minor OpcodeValue="0x5" Node="/sys/class/devfreq/soc:qcom,memlat-cpu0/min_freq" />
-        <Minor OpcodeValue="0x6" Node="/sys/class/devfreq/soc:qcom,memlat-cpu4/min_freq" />
-        <Minor OpcodeValue="0x7" Node="/sys/class/devfreq/soc:qcom,cpu0-cpu-llcc-lat/min_freq" />
-        <Minor OpcodeValue="0x8" Node="/sys/class/devfreq/soc:qcom,cpu0-cpu-llcc-lat/mem_latency/ratio_ceil" />
-        <Minor OpcodeValue="0x9" Node="/sys/class/devfreq/soc:qcom,cpu4-cpu-llcc-lat/mem_latency/ratio_ceil" />
-        <Minor OpcodeValue="0xA" Node="/sys/class/devfreq/soc:qcom,cpu0-cpu-llcc-lat/mem_latency/stall_floor" />
-        <Minor OpcodeValue="0xB" Node="/sys/class/devfreq/soc:qcom,cpu4-cpu-llcc-lat/mem_latency/stall_floor" />
-        <Minor OpcodeValue="0xC" Node="/sys/class/devfreq/soc:qcom,cpu0-llcc-ddr-lat/min_freq" />
-        <Minor OpcodeValue="0xD" Node="/sys/class/devfreq/soc:qcom,cpu0-llcc-ddr-lat/mem_latency/ratio_ceil" />
-        <Minor OpcodeValue="0xE" Node="/sys/class/devfreq/soc:qcom,cpu4-llcc-ddr-lat/mem_latency/ratio_ceil" />
-        <Minor OpcodeValue="0xF" Node="/sys/class/devfreq/soc:qcom,cpu0-llcc-ddr-lat/mem_latency/stall_floor" />
-        <Minor OpcodeValue="0x10" Node="/sys/class/devfreq/soc:qcom,cpu4-llcc-ddr-lat/mem_latency/stall_floor" />
-    <!-- memlat major end -->
-
-    </PerfResources>
-</ResourceConfigs>
diff --git a/proprietary/vendor/etc/perf/perfboostsconfig.xml b/proprietary/vendor/etc/perf/perfboostsconfig.xml
deleted file mode 100644
index ab4e418..0000000
--- a/proprietary/vendor/etc/perf/perfboostsconfig.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-/* Copyright (c) 2017 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-->
-
-        <!-- Type="1", main launch boost of 2sec -->
-
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG resource opcode, value-->
-        <Config
-            Id="0x00001081" Type="1" Enable="true" Timeout="2000"  Target="sdm632"
-            Resources="0x40C00000, 0x1, 0x40800100, 0x7E0, 0x40800000, 0x579" />
-
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- SCHED_SPILL_NR_RUN resource opcode, value-->
-        <!-- SCHED_RESTRICT_CLUSTER_SPILL resource opcode, value-->
-        <Config
-            Id="0x00001081" Type="1" Enable="true" Timeout="2000"
-            Resources="0x40C00000, 0x1, 0x40800100, 0x7E0, 0x40C2C000, 0x1, 0x40C34000, 0x0" />
-
-    <!--app lauch boost (disabling packing)-->
-        <!-- DISABLE_POWER_COLLAPSE resource opcode, value-->
-
-        <!-- Type="2", launch boost for disable packing 1.5sec -->
-        <Config
-            Id="0x00001081" Type="2" Enable="true" Timeout="1500"
-            Resources="0x40400000, 0x1" />
-
-    <!-- config_enablePerfBoostForAnimation-->
-        <!-- Type="1", Animation boost of 0.6sec -->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
-        <Config
-            Id="0x00001083" Enable="true" Timeout="600"  Target="sdm632"
-            Resources="0x40800100, 0x7E0, 0x40800000, 0x446" />
-
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <Config
-            Id="0x00001083" Enable="true" Timeout="600"
-            Resources="0x40800100, 0x7E0" />
-
-    <!--Vertical Scroll boost-->
-        <!-- Type="1", Vertical Scroll boost -->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value -->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <Config
-            Id="0x00001080" Type="1" Enable="true"  Target="sdm632"
-            Resources="0x40800100, 0x7E0, 0x40800000, 0x446,0x40C00000, 0x2" />
-
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
-        <Config
-            Id="0x00001080" Type="1" Enable="true"
-            Resources="0x40800100, 0x7E0" />
-
-    <!--Horizontal Scroll boost-->
-        <!-- Type="2", Horizontal Scroll boost -->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value -->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <Config
-            Id="0x00001080" Type="2" Enable="true"  Target="sdm632"
-            Resources="0x40800100, 0x7E0, 0x40800000, 0x446,0x40C00000, 0x2" />
-
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
-        <Config
-            Id="0x00001080" Type="2" Enable="true"
-            Resources="0x40800100, 0x7E0" />
-    <!--Pre-Fling boost-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
-        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- Type="4", Pre-Fling boost -->
-        <Config
-            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="sdm632"
-            Resources="0x40800100, 0x7E0, 0x40800000, 0x446,0x40C00000, 0x2"  />
-
-    <!--MTP boost-->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- STORAGE CLK SCALING resource opcode, value-->
-
-        <!-- Type="", MTP boost -->
-
-        <Config
-            Id="0x00001086" Enable="true"
-            Resources="0x40C00000, 0x1, 0x40804100, 0xFFF, 0x40800100, 1400, 0x42C10000, 0x1" />
-
-    <!--PackageInstall boost-->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- Type="", Package Install boost -->
-
-        <Config
-            Id="0x00001088" Enable="true"
-            Resources="0x40C00000, 0x1, 0x40804100, 0xFFF, 0x40800100, 0xFFF" />
-
-    <!--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="sdm632"
-            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 0xFFF,
-                       0x40800100,0xFFF" />
-
-        <Config
-            Id="0x00001089" Enable="true" Timeout="1500"
-            Resources="0x40C00000, 0x1, 0x40804100, 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="sdm632"
-            Resources="0x40800100, 1000, 0x4280C000, 596" />
-
-        <Config
-            Id="0x00001090" Enable="true" Timeout="1000"
-            Resources="0x40800100, 1000, 0x4280C000, 596" />
-
-    <!--Display on Resource -->
-        <!-- Display on resource opcode, value -->
-        <Config
-                Id="0x00001041" Enable="true" Timeout="0" Target="msm8953"
-                Resources="0x40000000, 1" />
-        <Config
-                Id="0x00001041" Enable="true" Timeout="0" Target="sdm450"
-                Resources="0x40000000, 1" />
-        <Config
-                Id="0x00001041" Enable="true" Timeout="0" Target="sdm632"
-                Resources="0x40000000, 1" />
-    <!--Display off Resource -->
-        <!-- Display on resource opcode, value -->
-        <Config
-                Id="0x00001040" Enable="true" Timeout="0" Target="msm8953"
-                Resources="0x40000000, 0x0" />
-        <Config
-                Id="0x00001040" Enable="true" Timeout="0" Target="sdm450"
-                Resources="0x40000000, 0x0" />
-        <Config
-                Id="0x00001040" Enable="true" Timeout="0" Target="sdm632"
-                Resources="0x40000000, 0x0" />
-        <!--PackageInstall 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="", Package Install boost -->
-        <Config
-               Id="0x00001088" Enable="true" Target="msm8953"
-               Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000,0xFFF,0x40800100,0xFFF" />
-    </PerfBoost>
-</BoostConfigs>
diff --git a/proprietary/vendor/etc/perf/perfconfigstore.xml b/proprietary/vendor/etc/perf/perfconfigstore.xml
deleted file mode 100644
index 41599fd..0000000
--- a/proprietary/vendor/etc/perf/perfconfigstore.xml
+++ /dev/null
@@ -1,42 +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>
-
-                <!--System Properties -->
-                <Prop Name="ro.vendor.qti.sys.fw.bservice_age" Value="5000" />
-                <Prop Name="ro.vendor.qti.sys.fw.bservice_limit" Value="5" />
-                <Prop Name="ro.vendor.qti.sys.fw.bservice_enable" Value="true" />
-                <Prop Name="ro.vendor.qti.sys.fw.use_trim_settings" Value="true" />
-                <Prop Name="ro.vendor.qti.sys.fw.empty_app_percent" Value="50" />
-                <Prop Name="ro.vendor.qti.sys.fw.trim_empty_percent" Value="100" />
-                <Prop Name="ro.vendor.qti.sys.fw.trim_cache_percent" Value="100" />
-                <Prop Name="ro.vendor.qti.sys.fw.trim_enable_memory" Value="2147483648" />
-                <Prop Name="ro.vendor.qti.am.reschedule_service" Value="true" />
-                <Prop Name="ro.vendor.at_library" Value="libqti-at.so" />
-                <Prop Name="ro.lmk.enable_userspace_lmk" Value="false" />
-                <Prop Name="vendor.perf.gestureflingboost.enable" Value="true" />
-
-                <!--Vendor Properties -->
-                <Prop Name="vendor.iop.enable_iop" Value="0" />
-                <Prop Name="vendor.iop.enable_uxe" Value="0" />
-                <Prop Name="vendor.perf.iop_v3.enable" Value="0" />
-                <Prop Name="vendor.perf.iop_v3.enable.debug" Value="0" />
-                <Prop Name="vendor.enable.prefetch" Value="0" />
-                <Prop Name="vendor.iop.enable_prefetch_ofr" Value="0" />
-    </PerfConfigs>
-</PerfConfigsStore>
diff --git a/proprietary/vendor/etc/perf/targetconfig.xml b/proprietary/vendor/etc/perf/targetconfig.xml
deleted file mode 100644
index a831a3d..0000000
--- a/proprietary/vendor/etc/perf/targetconfig.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
- * All Rights Reserved.
- * Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-
-<TargetConfig>
-
-    <!-- All the target related information goes in TargetInfo tag.
-    Following are the supported fields for  TargetInfo tag.
-        Mandatory Fields
-        * NumClusters, number of clusters
-        * TotalNumCores, total number of cores
-        * SocIds, a comma seperated list of supported socids for this target.
-        Other Fields
-        * Target, target name.
-        * SynCore, default value is "1" implies sync core and change to "0" for async core.
-        * CoreCtlCpu, core_ctl is enabled on which physical core, defalut value is "-1".
-        * MinCoreOnline, minimum number of cores needed to be online, default value is "0"
-        * GovInstanceType, default value "0" which implies "CLUSTER_BASED_GOV_INSTANCE",
-          can be changed to "1" for "SINGLE_GOV_INSTANCE".
-        * CpufreqGov, default value is "0" which implies "INTERACTIVE", can be changed it
-          to "1" for "SCHEDUTIL".
-    -->
-
-    <!-- For each cluster,write a seperate ClustersInfo tag.
-        Following are the supported fields for ClustersInfo tag.
-        Mandatory Fields
-        * Id, cluster number starts with index 0.
-        * NumCores, total number of cores for that cluster.
-        Other Fields
-        * Type, whther a "little" or "big" cluster.
-        (Type is mandatory, If there is more than one cluster.)
-        * MaxFrequency, Any limitations for max frequency for that cluster.
-    -->
-
-    <!-- For targets sharing the same platfrom, we can have seperate config tag for each
-         of those targets with different number in the Config tag and basing on the socId
-         of the target device, we decide which configs to consider. -->
-
-    <Config1>
-
-         <TargetInfo
-             Target="msm8953"
-             NumClusters="2"
-             TotalNumCores="8"
-             SocIds="293,304"
-             SynCore="1"
-             MinCoreOnline="0"
-             GovInstanceType="1" />
-
-         <ClustersInfo Id="0" NumCores="4" Type="little" />
-         <ClustersInfo Id="1" NumCores="4" Type="big" />
-
-    </Config1>
-
-    <Config2>
-
-         <TargetInfo
-             Target="sdm450"
-             NumClusters="2"
-             TotalNumCores="8"
-             SocIds="338,351"
-             SynCore="1"
-             MinCoreOnline="0"
-             GovInstanceType="1" />
-
-         <ClustersInfo Id="0" NumCores="4" Type="little" />
-         <ClustersInfo Id="1" NumCores="4" Type="big" />
-
-    </Config2>
-    <Config3>
-
-         <TargetInfo
-             Target="sdm632"
-             NumClusters="2"
-             TotalNumCores="8"
-             SocIds="349,350"
-             SynCore="1"
-             MinCoreOnline="0" />
-
-         <ClustersInfo Id="0" NumCores="4" Type="little" />
-         <ClustersInfo Id="1" NumCores="4" Type="big" />
-
-    </Config3>
-</TargetConfig>
diff --git a/proprietary/vendor/etc/perf/targetresourceconfigs.xml b/proprietary/vendor/etc/perf/targetresourceconfigs.xml
deleted file mode 100644
index c440cb2..0000000
--- a/proprietary/vendor/etc/perf/targetresourceconfigs.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
- * All Rights Reserved.
- * Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-
-<!-- This is a target specific resource config file which can be
-used to overwrite the node paths mentioned in common resources file
-and also to mention the resources which are not supported. -->
-
-<!-- This file supports only Config tag, which has the following fields
-* MajorValue and MinorValue, both are required to uniquely
-identify the resource.
-* Node, the new node path to overwrite the already existing one
-of commonresourceconfigs.xml file.
-* Supported, to indicate whether the resource is supported or not.
-* For each config tag, either of Node or Supported fields need
-to be mentioned. -->
-
-<!-- NOTE - It is not Mandatory to write all the resources which are not supported
-as anyway perflock calls of these resources would fail. -->
-
-<ResourceConfigs>
-    <PerfResources>
-
-        <Config MajorValue="0x1" MinorValue="0x2" Supported="no" /> <!-- lpm_bias_hyst -->
-        <Config MajorValue="0x1" MinorValue="0x3" Supported="no" /> <!-- lpm_ref_stddev -->
-        <Config MajorValue="0x1" MinorValue="0x4" Supported="no" /> <!-- lpm_tmr_add -->
-
-        <Config MajorValue="0x3" MinorValue="0x3" Supported="no" /> <!-- sched_small_task -->
-        <Config MajorValue="0x3" MinorValue="0xF" Supported="no" /> <!-- top-app_cpus -->
-        <Config MajorValue="0x3" MinorValue="0x10" Supported="no" /> <!-- foreground_cpus -->
-        <Config MajorValue="0x3" MinorValue="0x11" Supported="no" /> <!-- system_background_cpus -->
-        <Config MajorValue="0x3" MinorValue="0x12" Supported="no" /> <!-- background_cpus -->
-        <Config MajorValue="0x3" MinorValue="0x15" Supported="no" /> <!-- sched_group_upmigrate -->
-        <Config MajorValue="0x3" MinorValue="0x16" Supported="no" /> <!-- sched_group_downmigrate -->
-        <Config MajorValue="0x3" MinorValue="0x18" Supported="no" /> <!-- schedtune.prefer_idle -->
-        <Config MajorValue="0x3" MinorValue="0xB" Supported="no" Kernel="4.9" /> <!-- sched_spill_nr_run -->
-        <Config MajorValue="0x3" MinorValue="0xD" Supported="no" Kernel="4.9" /> <!-- sched_restrict_cluster_spill -->
-
-        <!-- For INTERACTIVE major, all the interactive minors are not supported
-        by default as the recent target moved to schedutil. So, for older targets
-        where interactive minors are supported they need to be enabled and schedutil
-        minors are disabled. -->
-        <Config MajorValue="0x5" MinorValue="0x0" Node="/sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay" /> <!-- above_hispeed_delay -->
-        <Config MajorValue="0x5" MinorValue="0x1" Node="/sys/devices/system/cpu/cpufreq/interactive/boost" /> <!-- boost -->
-        <Config MajorValue="0x5" MinorValue="0x3" Node="/sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration" /> <!-- boostpulse_duration -->
-        <Config MajorValue="0x5" MinorValue="0x4" Node="/sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load" /> <!-- go_hispeed_load -->
-        <Config MajorValue="0x5" MinorValue="0x5" Node="/sys/devices/system/cpu/cpufreq/interactive/hispeed_freq" /> <!-- hispeed_freq -->
-        <Config MajorValue="0x5" MinorValue="0x6" Node="/sys/devices/system/cpu/cpufreq/interactive/io_is_busy" /> <!-- io_is_busy -->
-        <Config MajorValue="0x5" MinorValue="0x7" Node="/sys/devices/system/cpu/cpufreq/interactive/min_sample_time" /> <!-- min_sample_time -->
-        <Config MajorValue="0x5" MinorValue="0x8" Node="/sys/devices/system/cpu/cpufreq/interactive/target_loads" /> <!-- target_loads -->
-        <Config MajorValue="0x5" MinorValue="0x9" Node="/sys/devices/system/cpu/cpufreq/interactive/timer_rate" /> <!-- timer_rate -->
-        <Config MajorValue="0x5" MinorValue="0xA" Node="/sys/devices/system/cpu/cpufreq/interactive/timer_slack" /> <!-- timer_slack -->
-        <Config MajorValue="0x5" MinorValue="0xB" Node="/sys/devices/system/cpu/cpufreq/interactive/max_freq_hysteresis" /> <!-- max_freq_hysteresis -->
-        <Config MajorValue="0x5" MinorValue="0xC" Node="/sys/devices/system/cpu/cpufreq/interactive/use_sched_load" /> <!-- use_sched_load -->
-        <Config MajorValue="0x5" MinorValue="0xD" Node="/sys/devices/system/cpu/cpufreq/interactive/use_migration_notif" /> <!-- use_migration_notif -->
-        <Config MajorValue="0x5" MinorValue="0xE" Node="/sys/devices/system/cpu/cpufreq/interactive/ignore_hispeed_on_notif " /> <!-- ignore_hispeed_on_notif -->
-        <Config MajorValue="0x5" MinorValue="0xF" Supported="no" />
-        <Config MajorValue="0x5" MinorValue="0x10" Supported="no" />
-        <Config MajorValue="0x5" MinorValue="0x11" Supported="no" />
-        <Config MajorValue="0x5" MinorValue="0xF" Target="sdm632" Supported="yes" />
-        <Config MajorValue="0x5" MinorValue="0x10" Target="sdm632" Supported="yes" />
-        <Config MajorValue="0x5" MinorValue="0x11" Target="sdm632" Supported="yes" />
-        <Config MajorValue="0x5" MinorValue="0xF" Target="sdm450" Kernel="4.9" Supported="yes" Node="/sys/devices/system/cpu/cpufreq/schedutil/hispeed_freq" />
-        <Config MajorValue="0x5" MinorValue="0x10" Target="sdm450" Kernel="4.9" Supported="yes" Node="/sys/devices/system/cpu/cpufreq/schedutil/hispeed_load" />
-        <Config MajorValue="0x5" MinorValue="0x11" Target="sdm450" Kernel="4.9" Supported="yes" Node="/sys/devices/system/cpu/cpufreq/schedutil/pl" />
-
-        <Config MajorValue="0x9" MinorValue="0x7" Supported="yes" /> <!-- cpu.notify_on_migrate -->
-
-        <Config MajorValue="0xB" MinorValue="0x2" Supported="no" /> <!-- input_boost_freq -->
-
-        <!-- All the minors of LLCBW_HWMON MAJOR are not supported -->
-        <Config MajorValue="0xC" MinorValue="0x0" Supported="no" />
-        <Config MajorValue="0xC" MinorValue="0x1" Supported="no" />
-        <Config MajorValue="0xC" MinorValue="0x2" Supported="no" />
-        <Config MajorValue="0xC" MinorValue="0x3" Supported="no" />
-
-        <Config MajorValue="0xD" MinorValue="0x0" Supported="no" /> <!--  l3_min_freq -->
-
-    </PerfResources>
-</ResourceConfigs>
diff --git a/proprietary/vendor/lib/libperfconfig.so b/proprietary/vendor/lib/libperfconfig.so
deleted file mode 100644
index 5668a60..0000000
Binary files a/proprietary/vendor/lib/libperfconfig.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libperfgluelayer.so b/proprietary/vendor/lib/libperfgluelayer.so
deleted file mode 100644
index f08274d..0000000
Binary files a/proprietary/vendor/lib/libperfgluelayer.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libqti-perfd-client.so b/proprietary/vendor/lib/libqti-perfd-client.so
deleted file mode 100644
index 7a558b4..0000000
Binary files a/proprietary/vendor/lib/libqti-perfd-client.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libqti-perfd.so b/proprietary/vendor/lib/libqti-perfd.so
deleted file mode 100644
index 69ca944..0000000
Binary files a/proprietary/vendor/lib/libqti-perfd.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libqti-util.so b/proprietary/vendor/lib/libqti-util.so
deleted file mode 100644
index f8833a1..0000000
Binary files a/proprietary/vendor/lib/libqti-util.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libperfconfig.so b/proprietary/vendor/lib64/libperfconfig.so
deleted file mode 100644
index 3c2a1ac..0000000
Binary files a/proprietary/vendor/lib64/libperfconfig.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libperfgluelayer.so b/proprietary/vendor/lib64/libperfgluelayer.so
deleted file mode 100644
index 98562e8..0000000
Binary files a/proprietary/vendor/lib64/libperfgluelayer.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libqti-perfd-client.so b/proprietary/vendor/lib64/libqti-perfd-client.so
deleted file mode 100644
index 9c00365..0000000
Binary files a/proprietary/vendor/lib64/libqti-perfd-client.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libqti-perfd.so b/proprietary/vendor/lib64/libqti-perfd.so
deleted file mode 100644
index d5a9205..0000000
Binary files a/proprietary/vendor/lib64/libqti-perfd.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libqti-util.so b/proprietary/vendor/lib64/libqti-util.so
deleted file mode 100644
index 17c7334..0000000
Binary files a/proprietary/vendor/lib64/libqti-util.so and /dev/null differ