diff --git a/r8q/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service b/r8q/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service
deleted file mode 100644
index cc14f58..0000000
Binary files a/r8q/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service and /dev/null differ
diff --git a/r8q/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service b/r8q/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service
deleted file mode 100644
index 4e615e4..0000000
Binary files a/r8q/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service and /dev/null differ
diff --git a/r8q/proprietary/vendor/etc/init/vendor.qti.hardware.iop@2.0-service.rc b/r8q/proprietary/vendor/etc/init/vendor.qti.hardware.iop@2.0-service.rc
deleted file mode 100644
index 05f9d1f..0000000
--- a/r8q/proprietary/vendor/etc/init/vendor.qti.hardware.iop@2.0-service.rc
+++ /dev/null
@@ -1,17 +0,0 @@
-#   @file    io-p.c
-#   @brief   Defination for iop service
-#
-#   DESCRIPTION
-#    ---------------------------------------------------------------------------
-#        Copyright (c) 2011-2017 Qualcomm Technologies, Inc.
-#        All Rights Reserved.
-#        Confidential and Proprietary - Qualcomm Technologies, Inc.
-#    ---------------------------------------------------------------------------
-
-service iop-hal-2-0 /vendor/bin/hw/vendor.qti.hardware.iop@2.0-service
-    interface vendor.qti.hardware.iop@2.0::IIop default
-    oneshot
-    disabled
-    class hal
-    user root
-    group root readproc
diff --git a/r8q/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.2-service.rc b/r8q/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.2-service.rc
deleted file mode 100644
index 2ca0d64..0000000
--- a/r8q/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.2-service.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-#  @file    vendor.qti.hardware.perf@2.2-service.rc
-#  @brief   Defination perf service
-#
-#  DESCRIPTION
-#  ---------------------------------------------------------------------------
-#       Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
-#       All Rights Reserved.
-#       Confidential and Proprietary - Qualcomm Technologies, Inc.
-#  ---------------------------------------------------------------------------
-service perf-hal-2-2 /vendor/bin/hw/vendor.qti.hardware.perf@2.2-service
-    class hal
-    user root
-    group root readproc oem_2907
diff --git a/r8q/proprietary/vendor/etc/perf/commonresourceconfigs.xml b/r8q/proprietary/vendor/etc/perf/commonresourceconfigs.xml
deleted file mode 100644
index 3f40225..0000000
--- a/r8q/proprietary/vendor/etc/perf/commonresourceconfigs.xml
+++ /dev/null
@@ -1,299 +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" />
-        <Minor OpcodeValue="0x5" Node="/sys/module/lpm_levels/parameters/lpm_ipi_prediction" Supported="no" />
-    <!-- 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" />
-        <Minor OpcodeValue="0x27" Node="/proc/sys/kernel/sched_many_wakeup_threshold" />
-        <Minor OpcodeValue="0x28" Node="/proc/sys/kernel/sched_sync_hint_enable" />
-        <Minor OpcodeValue="0x29" Node="/proc/sys/kernel/sched_ravg_window_nr_ticks" />
-        <Minor OpcodeValue="0x2A" Node="/proc/sys/kernel/sched_prefer_spread" />
-        <Minor OpcodeValue="0x2B" Node="/dev/cpuctl/top-app/cpu.uclamp.min" />
-        <Minor OpcodeValue="0x2C" Node="/proc/%d/sched_boost" Supported="yes" /> <!-- enable sched_task_boost for top-app render thread-->
-        <Minor OpcodeValue="0x2D" Node="/proc/%d/sched_boost" Supported="yes" /> <!-- disable sched_task_boost for top-app render thread-->
-        <Minor OpcodeValue="0x2E" Node="/proc/sys/walt/sched_task_unfilter_period" />
-        <Minor OpcodeValue="0x2F" Node="/proc/sys/walt/sched_conservative_pl" />
-        <Minor OpcodeValue="0x30" Node="/proc/sys/walt/sched_coloc_busy_hyst_cpu_busy_pct" />
-        <Minor OpcodeValue="0x31" Node="/proc/sys/walt/sched_coloc_busy_hyst_cpu_ns" />
-        <Minor OpcodeValue="0x32" Node="/proc/sys/kernel/walt_rtg_cfs_boost_prio" />
-        <Minor OpcodeValue="0x33" Node="/proc/sys/kernel/sched_force_lb_enable" Supported="yes" />
-        <Minor OpcodeValue="0x34" Node="/proc/%d/sched_low_latency" Supported="yes" />
-        <Minor OpcodeValue="0x35" Node="/proc/sys/kernel/sched_min_granularity_ns" />
-        <Minor OpcodeValue="0x36" Node="/proc/sys/kernel/walt_low_latency_task_threshold" />
-        <Minor OpcodeValue="0x37" Node="/dev/stune/foreground/schedtune.prefer_idle" />
-        <Minor OpcodeValue="0x38" Node="/proc/sys/kernel/%s" Supported="no"/>
-        <Minor OpcodeValue="0x39" Node="/dev/stune/top-app/schedtune.colocate" Supported="no" />
-        <Minor OpcodeValue="0x3A" Node="/dev/cpuctl/top-app/cpu.uclamp.latency_sensitive" />
-        <Minor OpcodeValue="0x3B" Node="/dev/cpuctl/foreground/cpu.uclamp.latency_sensitive" />
-        <Minor OpcodeValue="0x3D" Node="/proc/sys/kernel/%s" Supported="no"/>
-    <!-- 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" />
-        <!--Here onwards are the path for new opcodes to mark CPU_LLCC_BW nodes.Upper ones
-            of this major are marked as unsupported for the tergets using the new opcodes-->
-        <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" />
-        <Minor OpcodeValue="0xC" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/use_ab" />
-        <Minor OpcodeValue="0xD" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/io_percent" />
-        <Minor OpcodeValue="0xE" Node="SPECIAL_NODE - llcbw_hwmon_hyst_opt" />
-        <Minor OpcodeValue="0xF" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/sample_ms" />
-        <Minor OpcodeValue="0x10" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/polling_interval" />
-        <Minor OpcodeValue="0x11" Node="/sys/devices/system/cpu/bus_dcvs/LLCC/190b6400.qcom,bwmon-llcc/min_freq" />
-        <Minor OpcodeValue="0x12" Node="/sys/devices/system/cpu/bus_dcvs/LLCC/190b6400.qcom,bwmon-llcc/max_freq" />
-    <!-- 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" />
-        <Minor OpcodeValue="0x8" Node="/sys/class/kgsl/kgsl/proc/%d/state" />
-        <Minor OpcodeValue="0x9" Node="/sys/class/kgsl/kgsl/proc/%d/state" />
-        <Minor OpcodeValue="0xA" Node="/sys/class/kgsl/kgsl-3d0/devfreq/mod_percent" />
-    <!-- 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" />
-        <Minor OpcodeValue="0x7" Node="SPECIAL_NODE - disable_pasr" />
-    <!-- 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" />
-        <!--Here onwards are the path for new opcodes to mark LLCC_DDR_BW nodes.Upper ones
-            of this major are marked as unsupported for the tergets using the new opcodes-->
-        <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" />
-        <Minor OpcodeValue="0x6" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/max_freq" />
-        <Minor OpcodeValue="0x7" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/decay_rate" />
-        <Minor OpcodeValue="0x8" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/io_percent" />
-        <Minor OpcodeValue="0x9" Node="SPECIAL_NODE - cpubw_hwmon_hyst_opt" />
-        <Minor OpcodeValue="0xA" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/low_power_ceil_mbps" />
-        <Minor OpcodeValue="0xB" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/low_power_io_percent" />
-        <Minor OpcodeValue="0xC" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/polling_interval" />
-        <Minor OpcodeValue="0xD" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/sample_ms" />
-        <Minor OpcodeValue="0xE" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/idle_mbps" />
-        <Minor OpcodeValue="0xF" Node="/sys/devices/system/cpu/bus_dcvs/DDR/19091000.qcom,bwmon-ddr/min_freq" />
-        <Minor OpcodeValue="0x10" Node="/sys/devices/system/cpu/bus_dcvs/DDR/19091000.qcom,bwmon-ddr/max_freq" />
-        <Minor OpcodeValue="0x11" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/use_ab" />
-
-    <!-- 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" />
-        <Minor OpcodeValue="0x11" Node="/sys/class/devfreq/18321000.qcom,devfreq-l3:qcom,cpu%d-cpu-l3-lat/max_freq" />
-        <Minor OpcodeValue="0x12" Node="/sys/class/devfreq/soc:qcom,cpu0-cpu-ddr-latfloor/min_freq" />
-        <Minor OpcodeValue="0x13" Node="/sys/class/devfreq/soc:qcom,cpu0-cpu-ddr-latfloor/max_freq" />
-        <Minor OpcodeValue="0x14" Node="/sys/class/devfreq/soc:qcom,cpu0-cpu-llcc-lat/max_freq" />
-        <Minor OpcodeValue="0x15" Node="/sys/class/devfreq/soc:qcom,cpu0-llcc-ddr-lat/max_freq" />
-        <Minor OpcodeValue="0x16" Node="/sys/devices/system/cpu/bus_dcvs/L3/soc:qcom,memlat:l3:prime/min_freq" />
-        <Minor OpcodeValue="0x17" Node="/sys/devices/system/cpu/bus_dcvs/LLCC/soc:qcom,memlat:llcc:silver/min_freq" />
-        <Minor OpcodeValue="0x18" Node="/sys/devices/system/cpu/bus_dcvs/DDR/soc:qcom,memlat:ddr:silver/min_freq" />
-    <!-- memlat major end -->
-
-    <!-- npu major start -->
-    <Major OpcodeValue="0xE" />
-        <!-- ALl the following minors node path might change based on target. -->
-        <Minor OpcodeValue="0x0" Node="/sys/class/devfreq/soc:qcom,npu-npu-llcc-bw/bw_hwmon/sample_ms" />
-        <Minor OpcodeValue="0x1" Node="/sys/class/devfreq/soc:qcom,npu-npu-llcc-bw/bw_hwmon/io_percent" />
-        <Minor OpcodeValue="0x2" Node="SPECIAL_NODE - npu_llcbw_hwmon_hyst_opt" />
-        <!--Here onwards are the path for new opcodes to mark NPU_LLCC_DDR_BW nodes.-->
-        <Minor OpcodeValue="0x3" Node="/sys/class/devfreq/soc:qcom,npu-llcc-ddr-bw/bw_hwmon/sample_ms" />
-        <Minor OpcodeValue="0x4" Node="/sys/class/devfreq/soc:qcom,npu-llcc-ddr-bw/bw_hwmon/io_percent" />
-        <Minor OpcodeValue="0x5" Node="SPECIAL_NODE - npu_ddr_llcbw_hwmon_hyst_opt" />
-    <!-- npu major end -->
-
-    </PerfResources>
-</ResourceConfigs>
diff --git a/r8q/proprietary/vendor/etc/perf/commonsysnodesconfigs.xml b/r8q/proprietary/vendor/etc/perf/commonsysnodesconfigs.xml
deleted file mode 100644
index 51d18d5..0000000
--- a/r8q/proprietary/vendor/etc/perf/commonsysnodesconfigs.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-/* Copyright (c) 2021 Qualcomm Technologies, Inc.
- * All Rights Reserved.
- * Confidential and Proprietary - Qualcomm Technologies, Inc.
- */
--->
-
-<ResourceConfigs>
-    <PerfResources>
-        <SysNode Idx="0x0" Node="/sys/module/msm_performance/parameters/num_clusters" />
-        <SysNode Idx="0x1" Node="/sys/module/msm_performance/parameters/managed_cpus" />
-        <SysNode Idx="0x2" Node="/sys/module/msm_performance/parameters/cpu_max_freq" />
-        <SysNode Idx="0x3" Node="/sys/module/msm_performance/events/cpu_hotplug" />
-        <SysNode Idx="0x4" Node="/sys/module/msm_performance/parameters/max_cpus" />
-        <SysNode Idx="0x5" Node="/sys/module/msm_performance/parameters/inst" />
-        <SysNode Idx="0x6" Node="/sys/module/msm_performance/parameters/splh_notif" />
-        <SysNode Idx="0x7" Node="/sys/module/msm_performance/notify/gfx_evt" />
-        <SysNode Idx="0x8" Node="/sys/module/msm_performance/parameters/evnt_gplaf_pid" />
-    </PerfResources>
-</ResourceConfigs>
diff --git a/r8q/proprietary/vendor/etc/perf/perfboostsconfig.xml b/r8q/proprietary/vendor/etc/perf/perfboostsconfig.xml
deleted file mode 100644
index e6cced6..0000000
--- a/r8q/proprietary/vendor/etc/perf/perfboostsconfig.xml
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-/* Copyright (c) 2017-2019 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-->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ PRIME Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ PRIME Core resource opcode, value-->
-        <!-- CPUBW_MAX_FREQ resource opcode, value-->
-        <!-- CPUBW_MIN_FREQ resource opcode, value-->
-        <!-- POWER COLLAPSE resource opcode, value-->
-        <!-- STORAGE CLK SCALING resource opcode, value-->
-        <!-- LLCC DDR LAT CPU0 MIN FREQ resource opcode, value-->
-        <!-- L3 resource opcode, value-->
-        <!-- GPU DISABLE resource opcode, value-->
-
-        <!-- Type="1", main launch boost of 2sec -->
-        <Config
-            Id="0x00001081" Type="1" Enable="true" Timeout="2000" Target="kona"
-            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF,
-                       0x40800000, 0xFFF, 0x40800100, 0xFFF, 0x40800200, 0xFFF, 0x41818000, 0xFF,
-                       0x41800000, 0xFF, 0x40400000, 0x1, 0x42C10000, 0x1, 0x43430100, 0x28C5,
-                       0x43400000, 0xFFFF, 0x4281C000, 2000" />
-
-    <!--app lauch boost (disabling packing)-->
-
-        <!-- Type="2", launch boost for disable packing 1.5sec -->
-        <Config
-            Id="0x00001081" Type="2" Enable="false" Timeout="1500" Target="kona"
-            Resources="" />
-
-    <!-- config_enableLaunchBoostv2-->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- SCHED GROUP DOWNMIGRATE resource opcode, value-->
-        <!-- SCHED GROUP UPMIGRATE resource opcode, value-->
-        <!-- SCHED_BUSY_HYSTERSIS_CPU_MASK resource opcode, value-->
-        <!-- LPM Bias resource opcode, value-->
-        <!-- SCHED DOWNMIGRATE resource opcode, value -->
-        <!-- SCHED UPMIGRATE resource opcode, value -->
-        <!-- SCHED DOWNMIGRATE PRIME resource opcode, value -->
-        <!-- SCHED UPMIGRATE PRIME resource opcode, value -->
-
-        <!-- Type="3", FA launch boost of 15sec -->
-        <Config
-            Id="0x00001081" Type="3" Enable="true" Timeout="15000" Target="kona"
-            Resources="0x40C00000, 0x3, 0x40C58000, 0x2D, 0x40C54000, 0x41,
-                      0x40C74000, 0xF0, 0x40408000, 0x63, 0x40C20000, 0x28,
-                      0x40C1C000, 0x3C, 0x40C20200, 0x28, 0x40C1C200, 0x3C" />
-
-    <!-- config_gameBoost-->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- SCHED GROUP DOWNMIGRATE resource opcode, value-->
-        <!-- SCHED GROUP UPMIGRATE resource opcode, value-->
-        <!-- SCHED_BUSY_HYSTERSIS_CPU_MASK resource opcode, value-->
-        <!-- LPM Bias resource opcode, value-->
-        <!-- SCHED DOWNMIGRATE resource opcode, value -->
-        <!-- SCHED UPMIGRATE resource opcode, value -->
-        <!-- SCHED DOWNMIGRATE PRIME resource opcode, value -->
-        <!-- SCHED UPMIGRATE PRIME resource opcode, value -->
-        <!-- STORAGE CLK SCALING resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ PRIME 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-->
-        <!-- LLCCBW resource opcode, value-->
-        <!-- L3 resource opcode, value-->
-
-        <!-- Type="4", FA launch boost of 15sec -->
-        <Config
-            Id="0x00001081" Type="6" Enable="true" Timeout="2000" Target="kona"
-            Resources="0x40C00000, 0x1, 0x40C58000, 0x2D, 0x40C54000, 0x41,
-                       0x40C74000, 0xF0, 0x40408000, 0x63, 0x40C20000, 0x28,
-                       0x40C1C000, 0x3C, 0x40C20200, 0x28, 0x40C1C200, 0x3C,
-                       0x42C10000, 0x1, 0x40800200, 0x76C, 0x40800000, 0x76C,
-                       0x40800100, 0x4B0, 0x41800000, 0x50, 0x43000000, 0x3A,
-                       0x43400000, 0x3480" />
-
-    <!--app launch boost (attach application) -->
-        <!-- SCHED_TASK_BOOST resource opcode, value-->
-        <Config
-            Id="0x00001081" Type="103" Enable="true" Timeout="2000" Target="kona"
-            Resources="0x40C80000, 0x0" />
-
-    <!--Animation boost -->
-        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ PRIME Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ PRIME Core resource opcode, value-->
-        <Config
-            Id="0x00001083" Enable="true" Timeout="400" Target="kona"
-            Resources="0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF,
-                       0x40800000, 0xFFF, 0x40800100, 0xFFF, 0x40800200, 0xFFF" />
-
-    <!--Vertical Scroll boost-->
-        <!-- LLCBW_MIN_FREQ resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
-        <!-- CPUBOOST_MIN_FREQ PRIME CORE resource opcode, value -->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- L3_MEMLAT_MIN_FREQ resource opcode, value -->
-        <!-- SCHED_BUSY_HYSTERSIS_CPU_MASK resource opcode, value-->
-        <!-- LPM Bias resource opcode, value-->
-        <!-- MIN_ONLINE_CPU_CLUSTER_BIG opcode, value-->
-        <!-- Below additional resources for 120+fps-->
-        <!-- SCHED_PREFER_SPREAD resource opcode, value -->
-
-        <!-- Type="1", Vertical Scroll boost -->
-        <Config
-            Id="0x00001080" Type="1" Enable="true" Target="kona" Fps="60"
-            Resources="0x43000000, 0x19, 0x40800000, 1000, 0x40800100, 1000, 0x40800200, 1000,
-                       0x40C00000, 0x2, 0x43400000, 0x1F40, 0x40C74000, 0xFF, 0x40408000, 0x63,
-                       0x41000000, 3" />
-        <Config
-            Id="0x00001080" Type="1" Enable="true" Target="kona" Fps="90"
-            Resources="0x43000000, 0x19, 0x40800000, 1000, 0x40800100, 1000, 0x40800200, 1000,
-                       0x40C00000, 0x2, 0x43400000, 0x1F40, 0x40C74000, 0xFF, 0x40408000, 0x63,
-                       0x41000000, 3" />
-        <Config
-            Id="0x00001080" Type="1" Enable="true" Target="kona" Fps="120"
-            Resources="0x43000000, 0x19, 0x40800000, 1000, 0x40800100, 1000, 0x40800200, 1000,
-                       0x40C00000, 0x2, 0x43400000, 0x1F40, 0x40C74000, 0xFF, 0x40408000, 0x63,
-                       0x41000000, 3, 0x40CA8000, 2" />
-        <Config
-            Id="0x00001080" Type="1" Enable="true" Target="kona" Fps="144"
-            Resources="0x43000000, 0x19, 0x40800000, 1000, 0x40800100, 1000, 0x40800200, 1000,
-                       0x40C00000, 0x2, 0x43400000, 0x1F40, 0x40C74000, 0xFF, 0x40408000, 0x63,
-                       0x41000000, 3, 0x40CA8000, 2" />
-
-    <!--Prefling Scroll boost-->
-        <!-- LLCBW_MIN_FREQ resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
-        <!-- CPUBOOST_MIN_FREQ PRIME CORE resource opcode, value -->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- L3_MEMLAT_MIN_FREQ resource opcode, value -->
-        <!-- SCHED_BUSY_HYSTERSIS_CPU_MASK resource opcode, value-->
-        <!-- LPM Bias resource opcode, value-->
-        <!-- MIN_ONLINE_CPU_CLUSTER_BIG opcode, value-->
-        <!-- Below additional resources for 120+fps-->
-        <!-- SCHED_PREFER_SPREAD resource opcode, value -->
-        <!-- TIMEOUT 80ms -->
-        <!-- Type="4", Prefling boost -->
-        <Config
-            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="kona" Fps="60"
-            Resources="0x43000000, 0x19, 0x40800000, 1000, 0x40800100, 1000, 0x40800200, 1000,
-                       0x40C00000, 0x2, 0x43400000, 0x1F40, 0x40C74000, 0xFF, 0x40408000, 0x63,
-                       0x41000000, 3" />
-        <Config
-            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="kona" Fps="90"
-            Resources="0x43000000, 0x19, 0x40800000, 1000, 0x40800100, 1000, 0x40800200, 1000,
-                       0x40C00000, 0x2, 0x43400000, 0x1F40, 0x40C74000, 0xFF, 0x40408000, 0x63,
-                       0x41000000, 3" />
-        <Config
-            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="kona" Fps="120"
-            Resources="0x43000000, 0x19, 0x40800000, 1000, 0x40800100, 1000, 0x40800200, 1000,
-                       0x40C00000, 0x2, 0x43400000, 0x1F40, 0x40C74000, 0xFF, 0x40408000, 0x63,
-                       0x41000000, 3, 0x40CA8000, 2" />
-        <Config
-            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="kona" Fps="144"
-            Resources="0x43000000, 0x19, 0x40800000, 1000, 0x40800100, 1000, 0x40800200, 1000,
-                       0x40C00000, 0x2, 0x43400000, 0x1F40, 0x40C74000, 0xFF, 0x40408000, 0x63,
-                       0x41000000, 3, 0x40CA8000, 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-->
-
-        <!-- Type="", MTP boost -->
-        <Config
-            Id="0x00001086" Enable="true" Target="kona"
-            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 1800,
-                       0x40800100, 1400" />
-
-    <!--Drag boost-->
-        <!-- LLCBW_MIN_FREQ resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
-        <!-- CPUBOOST_MIN_FREQ PRIME CORE resource opcode, value -->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- L3_MEMLAT_MIN_FREQ resource opcode, value -->
-        <!-- SCHED_BUSY_HYSTERSIS_CPU_MASK resource opcode, value-->
-        <!-- LPM Bias resource opcode, value-->
-        <!-- MIN_ONLINE_CPU_CLUSTER_BIG opcode, value-->
-        <!-- Below additional resources for 120+fps-->
-        <!-- SCHED_PREFER_SPREAD resource opcode, value -->
-        <!-- Type="1", Drag boost -->
-        <Config
-            Id="0x00001087" Type="1" Enable="true" Timeout="0" Target="kona" Fps="60"
-            Resources="0x43000000, 0x11, 0x40800000, 1000, 0x40800100, 1000, 0x40800200, 1000,
-                       0x40C00000, 0x2, 0x43400000, 0x1F40, 0x40C74000, 0xFF, 0x40408000, 0x63,
-                       0x41000000, 3" />
-        <Config
-            Id="0x00001087" Type="1" Enable="true" Timeout="0" Target="kona" Fps="90"
-            Resources="0x43000000, 0x11, 0x40800000, 1000, 0x40800100, 1000, 0x40800200, 1000,
-                       0x40C00000, 0x2, 0x43400000, 0x1F40, 0x40C74000, 0xFF, 0x40408000, 0x63,
-                       0x41000000, 3" />
-        <Config
-            Id="0x00001087" Type="1" Enable="true" Timeout="0" Target="kona" Fps="120"
-            Resources="0x43000000, 0x11, 0x40800000, 1000, 0x40800100, 1000, 0x40800200, 1000,
-                       0x40C00000, 0x2, 0x43400000, 0x1F40, 0x40C74000, 0xFF, 0x40408000, 0x63,
-                       0x41000000, 3, 0x40CA8000, 2" />
-        <Config
-            Id="0x00001087" Type="1" Enable="true" Timeout="0" Target="kona" Fps="144"
-            Resources="0x43000000, 0x11, 0x40800000, 1000, 0x40800100, 1000, 0x40800200, 1000,
-                       0x40C00000, 0x2, 0x43400000, 0x1F40, 0x40C74000, 0xFF, 0x40408000, 0x63,
-                       0x41000000, 3, 0x40CA8000, 2" />
-
-    <!--PackageInstall boost-->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ PRIME Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ PRIME Core resource opcode, value-->
-        <!-- SCHED_SYNC_HINT_ENABLE resource opcode, value -->
-        <!-- SCHED_FORCE_LB_ENABLE opcode, value-->
-        <!-- Type="", Package Install boost -->
-
-        <Config
-            Id="0x00001088" Enable="true" Target="kona"
-            Resources="0x40C00000, 0x2, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF,
-                       0x40800000,0xFFF, 0x40800100,0xFFF, 0x40800200, 0xFFF, 0x40CA0000, 0,
-                       0x40CCC000, 0" />
-
-    <!--Rotation latency boost-->
-        <!-- SCHEDBOOST resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MAX_FREQ PRIME Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ PRIME Core resource opcode, value-->
-        <!-- Type="", Rotation latency boost -->
-
-        <Config
-            Id="0x00001089" Enable="true" Timeout="1500" Target="kona"
-            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF,
-                       0x40800000,0xFFF, 0x40800100,0xFFF, 0x40800200,0xFFF" />
-
-    <!--Rotation animation boost-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- GPU_MIN_POWER_LEVEL resource opcode,value-->
-        <!-- Type="", Rotation animation boost -->
-
-        <Config
-            Id="0x00001090" Enable="true" Timeout="1000" Target="kona"
-            Resources="0x40800100, 1000, 0x42804000, 0" />
-
-    <!--Performance mode-->
-        <!-- SCHEDTUNE_BOOST -->
-        <!-- SCHED_WINDOW_TICKS_UPDATE -->
-        <!-- TASK_UNFILTER_NR_WINDOWS -->
-        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
-        <!-- CPUBOOST_MIN_FREQ PRIME Core resource opcode, value-->
-        <!-- SCHED_BUSY_HYSTERSIS_CPU_MASK resource opcode, value-->
-        <!-- LPM_BIAS_HYST resource opcode, value-->
-        <!-- Type="", Performance mode -->
-        <Config
-            Id="0x00001091" Enable="true" Target="kona"
-            Resources="0x40C70000, 20, 0x40CA4000, 2, 0x40C88000, 25, 0x40800000, 1574, 0x40800100, 691, 0x40800200, 1632,
-                       0x40C74000, 0xFF, 0x40408000, 0x63" />
-
-    <!--Display on Resource -->
-        <!-- Display on resource opcode, value -->
-        <Config
-                Id="0x00001041" Enable="true" Timeout="0" Target="kona"
-                Resources="0x40000000, 1" />
-    <!--Display off Resource -->
-        <!-- Display on resource opcode, value -->
-        <Config
-                Id="0x00001040" Enable="true" Timeout="0" Target="kona"
-                Resources="0x40000000, 0x0" />
-
-    <!--FPS Update from Framework-->
-        <!-- SCHED_WINDOW_TICKS_UPDATE resource opcode, value -->
-        <!-- Below additional resources for 120fps, 144fps-->
-        <!-- SCHED_PREFER_SPREAD resource opcode, value -->
-        <!-- Type indicates FPS -->
-        <!-- 30fps -->
-        <Config
-            Id="0x00001094" Type="30" Enable="true" Target="kona" Timeout="0"
-            Resources="0x40CA4000, 8" />
-        <!-- 45fps -->
-        <Config
-            Id="0x00001094" Type="45" Enable="true" Target="kona" Timeout="0"
-            Resources="0x40CA4000, 5" />
-        <!-- 60fps -->
-        <Config
-            Id="0x00001094" Type="60" Enable="true" Target="kona" Timeout="0"
-            Resources="0x40CA4000, 4" />
-        <!-- 90fps -->
-        <Config
-            Id="0x00001094" Type="90" Enable="true" Target="kona" Timeout="0"
-            Resources="0x40CA4000, 3" />
-        <!-- 120fps -->
-        <Config
-            Id="0x00001094" Type="120" Enable="true" Target="kona" Timeout="0"
-            Resources="0x40CA4000, 2, 0x40CA8000, 1" />
-        <!-- 144fps -->
-        <Config
-            Id="0x00001094" Type="144" Enable="true" Target="kona" Timeout="0"
-            Resources="0x40CA4000, 2, 0x40CA8000, 1" />
-        <!-- 180fps -->
-        <Config
-            Id="0x00001094" Type="180" Enable="true" Target="kona" Timeout="0"
-            Resources="0x40CA4000, 2" />
-        <!-- 240fps -->
-        <Config
-            Id="0x00001094" Type="240" Enable="true" Target="kona" Timeout="0"
-            Resources="0x40CA4000, 2" />
-
-    </PerfBoost>
-</BoostConfigs>
diff --git a/r8q/proprietary/vendor/etc/perf/perfconfigstore.xml b/r8q/proprietary/vendor/etc/perf/perfconfigstore.xml
deleted file mode 100644
index bfa51f6..0000000
--- a/r8q/proprietary/vendor/etc/perf/perfconfigstore.xml
+++ /dev/null
@@ -1,45 +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.iop.enable_uxe" Value="1" />
-                <Prop Name="vendor.debug.enable.lm" Value="true" />
-                <Prop Name="vendor.perf.iop_v3.enable" Value="true" />
-                <Prop Name="vendor.perf.iop_v3.enable.debug" Value="false" />
-                <Prop Name="vendor.enable.prefetch" Value="false" />
-                <Prop Name="vendor.iop.enable_prefetch_ofr" Value="false" />
-                <Prop Name="ro.vendor.perf.gfl.tap_ignore_enable" Value="true"/>
-
-                <!--System Properties -->
-                <Prop Name="ro.lmk.kill_heaviest_task_dup" Value="true" />
-                <Prop Name="ro.lmk.enhance_batch_kill" Value="false" />
-                <Prop Name="ro.lmk.enable_watermark_check" Value="true" />
-                <Prop Name="ro.lmk.enable_preferred_apps" Value="true" />
-                <Prop Name="ro.lmk.use_new_strategy_dup" Value="true" />
-                <Prop Name="ro.lmk.super_critical" Value="606" />
-                <Prop Name="ro.lmk.direct_reclaim_pressure" Value="45" />
-                <Prop Name="ro.lmk.reclaim_scan_threshold" Value="0" />
-                <Prop Name="vendor.perf.gestureflingboost.enable" Value="true" />
-                <Prop Name="vendor.perf.performancemode.support" Value="true" />
-                <Prop Name="ro.vendor.qti.sys.fw.bg_apps_limit" Value="60" />
-                <Prop Name="ro.vendor.at_library" Value="libqti-at.so" />
-                <Prop Name="vendor.perf.topAppRenderThreadBoost.enable" Value="false" />
-
-    </PerfConfigs>
-</PerfConfigsStore>
diff --git a/r8q/proprietary/vendor/etc/perf/targetconfig.xml b/r8q/proprietary/vendor/etc/perf/targetconfig.xml
deleted file mode 100644
index 412e8bf..0000000
--- a/r8q/proprietary/vendor/etc/perf/targetconfig.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Copyright (c) 2017-2019 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="kona"
-             NumClusters="3"
-             TotalNumCores="8"
-             SocIds="356"
-             SynCore="1"
-             CoreCtlCpu="4"
-             MinCoreOnline="0"
-             CpufreqGov="1" />
-
-         <ClustersInfo Id="0" NumCores="4" Type="little" />
-         <ClustersInfo Id="1" NumCores="3" Type="big" />
-         <ClustersInfo Id="2" NumCores="1" Type="prime" />
-
-    </Config1>
-
-</TargetConfig>
diff --git a/r8q/proprietary/vendor/etc/perf/targetresourceconfigs.xml b/r8q/proprietary/vendor/etc/perf/targetresourceconfigs.xml
deleted file mode 100644
index 1a8772d..0000000
--- a/r8q/proprietary/vendor/etc/perf/targetresourceconfigs.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Copyright (c) 2017-2019 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 modify the Supported field information. -->
-
-<!-- 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 path
-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="0x1" Supported="no" /> <!--  toggle_l2_pc_perf -->
-        <Config MajorValue="0x1" MinorValue="0x2" Node="/proc/sys/kernel/sched_busy_hyst_ns" />
-
-        <Config MajorValue="0x3" MinorValue="0x3" Supported="no" /> <!-- sched_small_task -->
-        <Config MajorValue="0x3" MinorValue="0x6" Supported="no" /> <!-- sched_init_task_load -->
-        <Config MajorValue="0x3" MinorValue="0xB" Supported="no" /> <!-- sched_spill_nr_run -->
-        <Config MajorValue="0x3" MinorValue="0xC" Supported="no" /> <!-- sched_static_cpu_pwr_cost -->
-        <Config MajorValue="0x3" MinorValue="0xD" Supported="no" /> <!-- sched_restrict_cluster_spill -->
-        <Config MajorValue="0x3" MinorValue="0x13" Supported="no" /> <!-- sched_set_freq_aggr -->
-        <Config MajorValue="0x3" MinorValue="0x14" Supported="no" /> <!-- sched_enable_thread_grouping -->
-        <Config MajorValue="0x3" MinorValue="0x17" Supported="no" /> <!-- sched_freq_aggr_threshold -->
-
-        <Config MajorValue="0x6" MinorValue="0x4" Supported="no" /> <!-- cpubw_hmon_low_power_ceil_mbps -->
-        <Config MajorValue="0x6" MinorValue="0x5" Supported="no" /> <!-- cpubw_hmon_low_power_io_percent -->
-        <Config MajorValue="0x6" MinorValue="0xA" Supported="no" />
-        <Config MajorValue="0x6" MinorValue="0xB" Supported="no" />
-        <Config MajorValue="0x6" MinorValue="0xC" Supported="no" />
-        <Config MajorValue="0x6" MinorValue="0xD" Supported="no" />
-        <Config MajorValue="0x6" MinorValue="0xE" Supported="no" />
-        <Config MajorValue="0x6" MinorValue="0xF" Supported="no" />
-        <Config MajorValue="0x6" MinorValue="0x10" Supported="no"/>
-
-        <Config MajorValue="0x6" MinorValue="0x0" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/min_freq" />
-        <Config MajorValue="0x6" MinorValue="0x1" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/decay_rate" />
-        <Config MajorValue="0x6" MinorValue="0x2" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/io_percent" />
-        <Config MajorValue="0x6" MinorValue="0x4" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/low_power_ceil_mbps" />
-        <Config MajorValue="0x6" MinorValue="0x5" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/low_power_io_percent" />
-        <Config MajorValue="0x6" MinorValue="0x6" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/max_freq" />
-        <Config MajorValue="0x6" MinorValue="0x7" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/polling_interval" />
-        <Config MajorValue="0x6" MinorValue="0x8" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/sample_ms" />
-        <Config MajorValue="0x6" MinorValue="0x9" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/idle_mbps" />
-
-        <Config MajorValue="0xB" MinorValue="0x2" Node="/sys/devices/system/cpu/cpu_boost/input_boost_freq"/>
-
-        <!-- llcbw L3 and DDR major end -->
-        <Config MajorValue="0xC" MinorValue="0x0" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/min_freq" />
-        <Config MajorValue="0xC" MinorValue="0x1" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/io_percent" />
-        <Config MajorValue="0xC" MinorValue="0x3" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/sample_ms" />
-        <Config MajorValue="0xC" MinorValue="0x4" Supported="no" />
-        <Config MajorValue="0xC" MinorValue="0x5" Supported="no" />
-        <Config MajorValue="0xC" MinorValue="0x6" Supported="no" />
-        <Config MajorValue="0xC" MinorValue="0x7" Supported="no" />
-        <Config MajorValue="0xC" MinorValue="0x8" Supported="no" />
-        <Config MajorValue="0xC" MinorValue="0x9" Supported="no" />
-        <Config MajorValue="0xC" MinorValue="0xA" Supported="no" />
-        <Config MajorValue="0xC" MinorValue="0xB" Supported="no" />
-        <Config MajorValue="0xC" MinorValue="0xC" Supported="no" />
-        <Config MajorValue="0xC" MinorValue="0xD" Supported="no" />
-        <Config MajorValue="0xC" MinorValue="0xE" Supported="no" />
-
-        <Config MajorValue="0xD" MinorValue="0x0" Node="/sys/class/devfreq/18590000.qcom,devfreq-l3:qcom,cpu%d-cpu-l3-lat/min_freq" />
-        <Config MajorValue="0xD" MinorValue="0x1" Node="/sys/class/devfreq/18590000.qcom,devfreq-l3:qcom,cpu0-cpu-l3-lat/mem_latency/ratio_ceil" />
-        <Config MajorValue="0xD" MinorValue="0x2" Node="/sys/class/devfreq/18590000.qcom,devfreq-l3:qcom,cpu4-cpu-l3-lat/mem_latency/ratio_ceil" />
-        <Config MajorValue="0xD" MinorValue="0x3" Node="/sys/class/devfreq/18590000.qcom,devfreq-l3:qcom,cpu0-cpu-l3-lat/mem_latency/stall_floor" />
-        <Config MajorValue="0xD" MinorValue="0x4" Node="/sys/class/devfreq/18590000.qcom,devfreq-l3:qcom,cpu4-cpu-l3-lat/mem_latency/stall_floor" />
-
-    </PerfResources>
-</ResourceConfigs>
diff --git a/r8q/proprietary/vendor/etc/platform_boost/boost_cap.xml b/r8q/proprietary/vendor/etc/platform_boost/boost_cap.xml
deleted file mode 100644
index b14805f..0000000
--- a/r8q/proprietary/vendor/etc/platform_boost/boost_cap.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2019 Qualcomm Technologies, Inc.
-    All Rights Reserved.
-    Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-
-<BoostCap>
-
-    <Cap target="cpu" capability="performance" value="level1"
-         opcode_value="2, 0x40800200, 0x4A0"/>
-
-    <Cap target="cpu" capability="performance" value="level2"
-         opcode_value="2, 0x40800200, 0x558"/>
-
-    <Cap target="cpu" capability="performance" value="level3"
-         opcode_value="2, 0x40800200, 0x610"/>
-
-    <Cap target="cpu" capability="performance" value="level4"
-         opcode_value="2, 0x40800200, 0x6C9"/>
-
-    <Cap target="cpu" capability="performance" value="level5"
-         opcode_value="2, 0x40800200, 0x781"/>
-
-    <Cap target="cpu" capability="performance" value="level6"
-         opcode_value="2, 0x40800200, 0x839"/>
-
-    <Cap target="cpu" capability="performance" value="level7"
-         opcode_value="2, 0x40800200, 0x8F1"/>
-
-    <Cap target="cpu" capability="performance" value="level8"
-         opcode_value="2, 0x40800200, 0x9A9"/>
-
-    <Cap target="cpu" capability="performance" value="level9"
-         opcode_value="2, 0x40800200, 0xA61"/>
-
-    <Cap target="cpu" capability="performance" value="level10"
-         opcode_value="2, 0x40800200, 0xB1A"/>
-
-</BoostCap>
diff --git a/r8q/proprietary/vendor/etc/platform_boost/boost_mode.xml b/r8q/proprietary/vendor/etc/platform_boost/boost_mode.xml
deleted file mode 100644
index 6a6d0b0..0000000
--- a/r8q/proprietary/vendor/etc/platform_boost/boost_mode.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2019 Qualcomm Technologies, Inc.
-    All Rights Reserved.
-    Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-
-<BoostMode>
-
-    <Mode name="scenario.generic.launch">
-        <hint_id>0x000010F0</hint_id>
-        <hint_type>1</hint_type>
-    </Mode>
-
-    <Mode name="scenario.generic.loading">
-        <hint_id>0x000010F0</hint_id>
-        <hint_type>2</hint_type>
-    </Mode>
-
-    <Mode name="scenario.generic.playing">
-        <hint_id>0x000010F0</hint_id>
-        <hint_type>3</hint_type>
-    </Mode>
-
-</BoostMode>
diff --git a/r8q/proprietary/vendor/etc/powerhint.xml b/r8q/proprietary/vendor/etc/powerhint.xml
deleted file mode 100644
index 655fa43..0000000
--- a/r8q/proprietary/vendor/etc/powerhint.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of The Linux Foundation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * Tuned for Product XY
- */
--->
-<HintConfigs>
-    <Powerhint>
-
-        <!-- POWER_HINT_ID_COMMON -->
-        <!-- llcc-ddr-bw hyst disable : MPCTLV3_LLCBW_HWMON_HYST_OPT(0x43008000)   : 0    -->
-        <!-- llcc-ddr-bw sample_ms    : MPCTLV3_LLCBW_HWMON_SAMPLE_MS(0x4300C000)  : 10   -->
-        <!-- llcc-ddr-bw min_freq     : MPCTLV3_LLCBW_HWMON_MIN_FREQ(0x43000000)   : 3879 -->
-        <!-- cpu-llcc-bw hyst disable : MPCTLV3_CPUBW_HWMON_HYST_OPT(0x4180C000)   : 0    -->
-        <!-- cpu-llcc-bw sample_ms    : MPCTLV3_CPUBW_HWMON_SAMPLE_MS(0x41820000)  : 16   -->
-        <!-- cpu-llcc-bw min_freq     : MPCTLV3_CPUBW_HWMON_MIN_FREQ(0x41800000)   : 9155 -->
-        <!-- cpu-llcc-bw io_percent   : MPCTLV3_CPUBW_HWMON_IO_PERCENT(0x41808000) : 80   -->
-        <Config
-            Id="0x00001331" Enable="true" Timeout="0" Target="kona"
-            Resources="0x43008000, 0, 0x4300C000, 10, 0x43000000, 38,
-                       0x4180C000, 0, 0x41820000, 16, 0x41800000, 91, 0x41808000, 80"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_FHD_30FPS -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1248 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1056 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              : 30   -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                : 40   -->
-        <Config
-            Id="0x00001332" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1248, 0x40800000, 1056, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_UHD_30FPS -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1420 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1056 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              : 30   -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                : 40   -->
-        <!-- gpu min lock            : MPCTLV3_GPU_MIN_POWER_LEVEL(0x42804000)            : 0x2(490Mhz)-->		
-        <Config
-            Id="0x00001333" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1420, 0x40800000, 1056, 0x40C20000, 30, 0x40C1C000, 40, 0x42804000, 2"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_FHD_60FPS -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1420 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1056 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              : 30   -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                : 40   -->
-        <Config
-            Id="0x00001334" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1420, 0x40800000, 1056, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_UHD_60FPS -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1420 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1056 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              : 30   -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                : 40   -->
-        <Config
-            Id="0x00001335" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1420, 0x40800000, 1056, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_8K_30FPS -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1420 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1056 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              : 30   -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                : 40   -->
-        <Config
-            Id="0x00001336" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1420, 0x40800000, 1056, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_FHD_30FPS_FRONT -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1248 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1056 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              :   30 -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                :   40 -->
-        <Config
-            Id="0x00001337" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1248, 0x40800000, 1056, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_UHD_30FPS_FRONT -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1420 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1056 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              : 30   -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                : 40   -->
-        <Config
-            Id="0x00001338" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1420, 0x40800000, 1056, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_FHD_60FPS_FRONT -->
-        <!-- low power mode disable  : MPCTLV3_ALL_CPUS_PWR_CLPS_DIS(0x40400000)          : 1    -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1075 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1286 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              : 20   -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                : 30   -->
-        <Config
-            Id="0x00001339" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40400000, 0x1, 0x40800100, 1075, 0x40800000, 1286, 0x40C20000, 20, 0x40C1C000, 30"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_UHD_60FPS_FRONT -->
-        <!-- low power mode disable  : MPCTLV3_ALL_CPUS_PWR_CLPS_DIS(0x40400000)          : 1    -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1075 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1286 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              : 20   -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                : 30   -->
-        <Config
-            Id="0x0000133A" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40400000, 0x1, 0x40800100, 1075, 0x40800000, 1286, 0x40C20000, 20, 0x40C1C000, 30"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_HFR -->
-        <!-- low power mode disable  : MPCTLV3_ALL_CPUS_PWR_CLPS_DIS(0x40400000)          : 1    -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1075 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1286 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              : 30   -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                : 40   -->
-        <Config
-            Id="0x0000133B" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40400000, 0x1, 0x40800100, 1075, 0x40800000, 1286, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_HFR_480FPS -->
-        <!-- low power mode disable  : MPCTLV3_ALL_CPUS_PWR_CLPS_DIS(0x40400000)          : 1    -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1075 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1286 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              : 20   -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                : 30   -->
-        <Config
-            Id="0x0000133C" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40400000, 0x1, 0x40800100, 1075, 0x40800000, 1286, 0x40C20000, 20, 0x40C1C000, 30"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_FHD_30FPS_BEAUTY -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1420 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1056 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              :   30 -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                :   40 -->
-        <Config
-            Id="0x0000133D" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1420, 0x40800000, 1056, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_UHD_30FPS_BEAUTY -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1420 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1056 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              : 30   -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                : 40   -->
-        <Config
-            Id="0x0000133E" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1420, 0x40800000, 1056, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_FHD_30FPS_BEAUTY_FRONT -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1420 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1056 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              :   30 -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                :   40 -->
-        <Config
-            Id="0x0000133F" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1420, 0x40800000, 1056, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_HD30FPS_HDR10 -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1420 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1286 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              :   30 -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                :   40 -->
-        <Config
-            Id="0x00001340" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1420, 0x40800000, 1286, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_UHD30FPS_HDR10 -->
-		<!-- low power mode disable  : MPCTLV3_ALL_CPUS_PWR_CLPS_DIS(0x40400000)		  : 1	 -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1420 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1286 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              :   30 -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                :   40 -->
-        <!-- gpu min lock            : MPCTLV3_GPU_MIN_POWER_LEVEL(0x42804000)            : 0x2(490Mhz)-->
-        <Config
-            Id="0x00001341" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40400000, 0x1, 0x40800100, 1420, 0x40800000, 1286, 0x40C20000, 30, 0x40C1C000, 40 , 0x42804000 , 0x2"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_HYPER_LAPSE -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1420 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1056 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              :   30 -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                :   40 -->
-        <Config
-            Id="0x00001342" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1420, 0x40800000, 1056, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_SUPER_STEADY -->
-		<!-- low power mode disable  : MPCTLV3_ALL_CPUS_PWR_CLPS_DIS(0x40400000)		  : 1	 -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1420 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1286 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              :   30 -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                :   40 -->
-        <!-- gpu min lock            : MPCTLV3_GPU_MIN_POWER_LEVEL(0x42804000)            : 0x2(490Mhz)-->
-        <Config
-            Id="0x00001343" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40400000, 0x1, 0x40800100, 1420, 0x40800000, 1286, 0x40C20000, 30, 0x40C1C000, 40 , 0x42804000 , 0x2"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_TRACKING_ZOOM -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1420 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1056 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              :   30 -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                :   40 -->
-        <Config
-            Id="0x00001344" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1420, 0x40800000, 1056, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-        <!-- POWER_HINT_ID_VIDEO_ENCODE_LIVE_FOCUS_VIDEO -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1248 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1286 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              : 30   -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                : 40   -->
-        <Config
-            Id="0x00001345" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1248, 0x40800000, 1286, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-        <!-- POWER_HINT_ID_LIVE_FOCUS -->
-        <!-- silver cluster min freq : MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0(0x40800100) : 1248 -->
-        <!-- gold cluster min freq   : MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0(0x40800000)    : 1056 -->
-        <!-- Sched downmigrate       : MPCTLV3_SCHED_DOWNMIGRATE(0x40C20000)              : 30   -->
-        <!-- Sched upmigrate         : MPCTLV3_SCHED_UPMIGRATE(0x40C1C000)                : 40   -->
-        <Config
-            Id="0x00001346" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40800100, 1248, 0x40800000, 1056, 0x40C20000, 30, 0x40C1C000, 40"/>
-
-    </Powerhint>
-</HintConfigs>
-
diff --git a/r8q/proprietary/vendor/lib/libperfconfig.so b/r8q/proprietary/vendor/lib/libperfconfig.so
deleted file mode 100644
index 3fb6cdd..0000000
Binary files a/r8q/proprietary/vendor/lib/libperfconfig.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib/libperfgluelayer.so b/r8q/proprietary/vendor/lib/libperfgluelayer.so
deleted file mode 100644
index c0f9e71..0000000
Binary files a/r8q/proprietary/vendor/lib/libperfgluelayer.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib/libperfioctl.so b/r8q/proprietary/vendor/lib/libperfioctl.so
deleted file mode 100644
index 6200dd4..0000000
Binary files a/r8q/proprietary/vendor/lib/libperfioctl.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib/libqti-iopd-client.so b/r8q/proprietary/vendor/lib/libqti-iopd-client.so
deleted file mode 100644
index 392fd50..0000000
Binary files a/r8q/proprietary/vendor/lib/libqti-iopd-client.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib/libqti-iopd.so b/r8q/proprietary/vendor/lib/libqti-iopd.so
deleted file mode 100644
index baab2f8..0000000
Binary files a/r8q/proprietary/vendor/lib/libqti-iopd.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib/libqti-perfd-client.so b/r8q/proprietary/vendor/lib/libqti-perfd-client.so
deleted file mode 100644
index e00e636..0000000
Binary files a/r8q/proprietary/vendor/lib/libqti-perfd-client.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib/libqti-perfd.so b/r8q/proprietary/vendor/lib/libqti-perfd.so
deleted file mode 100644
index 7f075f6..0000000
Binary files a/r8q/proprietary/vendor/lib/libqti-perfd.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib/libqti-util.so b/r8q/proprietary/vendor/lib/libqti-util.so
deleted file mode 100644
index bf420fb..0000000
Binary files a/r8q/proprietary/vendor/lib/libqti-util.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib/libqti-utils.so b/r8q/proprietary/vendor/lib/libqti-utils.so
deleted file mode 100644
index 8c26032..0000000
Binary files a/r8q/proprietary/vendor/lib/libqti-utils.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib/libskewknob.so b/r8q/proprietary/vendor/lib/libskewknob.so
deleted file mode 100644
index b4ddfc1..0000000
Binary files a/r8q/proprietary/vendor/lib/libskewknob.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib/vendor.qti.hardware.iop@1.0.so b/r8q/proprietary/vendor/lib/vendor.qti.hardware.iop@1.0.so
deleted file mode 100644
index 7f8b1bb..0000000
Binary files a/r8q/proprietary/vendor/lib/vendor.qti.hardware.iop@1.0.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib/vendor.qti.hardware.iop@2.0.so b/r8q/proprietary/vendor/lib/vendor.qti.hardware.iop@2.0.so
deleted file mode 100644
index 0e72a3f..0000000
Binary files a/r8q/proprietary/vendor/lib/vendor.qti.hardware.iop@2.0.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib/vendor.qti.memory.pasrmanager@1.0.so b/r8q/proprietary/vendor/lib/vendor.qti.memory.pasrmanager@1.0.so
deleted file mode 100644
index 6f72ebe..0000000
Binary files a/r8q/proprietary/vendor/lib/vendor.qti.memory.pasrmanager@1.0.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib/vendor.qti.memory.pasrmanager@1.1.so b/r8q/proprietary/vendor/lib/vendor.qti.memory.pasrmanager@1.1.so
deleted file mode 100644
index fd29d92..0000000
Binary files a/r8q/proprietary/vendor/lib/vendor.qti.memory.pasrmanager@1.1.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib/vendor.qti.power.pasrmanager@1.0.so b/r8q/proprietary/vendor/lib/vendor.qti.power.pasrmanager@1.0.so
deleted file mode 100644
index 65f83f0..0000000
Binary files a/r8q/proprietary/vendor/lib/vendor.qti.power.pasrmanager@1.0.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/liblearningmodule.so b/r8q/proprietary/vendor/lib64/liblearningmodule.so
deleted file mode 100644
index b985ffd..0000000
Binary files a/r8q/proprietary/vendor/lib64/liblearningmodule.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/libmeters.so b/r8q/proprietary/vendor/lib64/libmeters.so
deleted file mode 100644
index b5e9eb5..0000000
Binary files a/r8q/proprietary/vendor/lib64/libmeters.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/libperfconfig.so b/r8q/proprietary/vendor/lib64/libperfconfig.so
deleted file mode 100644
index a0f8c8a..0000000
Binary files a/r8q/proprietary/vendor/lib64/libperfconfig.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/libperfgluelayer.so b/r8q/proprietary/vendor/lib64/libperfgluelayer.so
deleted file mode 100644
index f1ce95b..0000000
Binary files a/r8q/proprietary/vendor/lib64/libperfgluelayer.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/libperfioctl.so b/r8q/proprietary/vendor/lib64/libperfioctl.so
deleted file mode 100644
index 3262bbf..0000000
Binary files a/r8q/proprietary/vendor/lib64/libperfioctl.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/libqti-iopd-client.so b/r8q/proprietary/vendor/lib64/libqti-iopd-client.so
deleted file mode 100644
index 3a472a0..0000000
Binary files a/r8q/proprietary/vendor/lib64/libqti-iopd-client.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/libqti-iopd.so b/r8q/proprietary/vendor/lib64/libqti-iopd.so
deleted file mode 100644
index f390db1..0000000
Binary files a/r8q/proprietary/vendor/lib64/libqti-iopd.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/libqti-perfd-client.so b/r8q/proprietary/vendor/lib64/libqti-perfd-client.so
deleted file mode 100644
index 385c6c7..0000000
Binary files a/r8q/proprietary/vendor/lib64/libqti-perfd-client.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/libqti-perfd.so b/r8q/proprietary/vendor/lib64/libqti-perfd.so
deleted file mode 100644
index 07edd6c..0000000
Binary files a/r8q/proprietary/vendor/lib64/libqti-perfd.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/libqti-util.so b/r8q/proprietary/vendor/lib64/libqti-util.so
deleted file mode 100644
index 73fa3fa..0000000
Binary files a/r8q/proprietary/vendor/lib64/libqti-util.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/libqti-utils.so b/r8q/proprietary/vendor/lib64/libqti-utils.so
deleted file mode 100644
index dd52529..0000000
Binary files a/r8q/proprietary/vendor/lib64/libqti-utils.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/libskewknob.so b/r8q/proprietary/vendor/lib64/libskewknob.so
deleted file mode 100644
index 00042e5..0000000
Binary files a/r8q/proprietary/vendor/lib64/libskewknob.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/vendor.qti.hardware.iop@1.0.so b/r8q/proprietary/vendor/lib64/vendor.qti.hardware.iop@1.0.so
deleted file mode 100644
index c59468f..0000000
Binary files a/r8q/proprietary/vendor/lib64/vendor.qti.hardware.iop@1.0.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/vendor.qti.hardware.iop@2.0.so b/r8q/proprietary/vendor/lib64/vendor.qti.hardware.iop@2.0.so
deleted file mode 100644
index 1e06bc2..0000000
Binary files a/r8q/proprietary/vendor/lib64/vendor.qti.hardware.iop@2.0.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/vendor.qti.memory.pasrmanager@1.0.so b/r8q/proprietary/vendor/lib64/vendor.qti.memory.pasrmanager@1.0.so
deleted file mode 100644
index f480877..0000000
Binary files a/r8q/proprietary/vendor/lib64/vendor.qti.memory.pasrmanager@1.0.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/vendor.qti.memory.pasrmanager@1.1.so b/r8q/proprietary/vendor/lib64/vendor.qti.memory.pasrmanager@1.1.so
deleted file mode 100644
index d855c7b..0000000
Binary files a/r8q/proprietary/vendor/lib64/vendor.qti.memory.pasrmanager@1.1.so and /dev/null differ
diff --git a/r8q/proprietary/vendor/lib64/vendor.qti.power.pasrmanager@1.0.so b/r8q/proprietary/vendor/lib64/vendor.qti.power.pasrmanager@1.0.so
deleted file mode 100644
index 2b50307..0000000
Binary files a/r8q/proprietary/vendor/lib64/vendor.qti.power.pasrmanager@1.0.so and /dev/null differ
diff --git a/r8q/r8q-vendor.mk b/r8q/r8q-vendor.mk
index f46d884..66bafb3 100644
--- a/r8q/r8q-vendor.mk
+++ b/r8q/r8q-vendor.mk
@@ -32,8 +32,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/bin/hw/rild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/rild \
     vendor/samsung/r8q/proprietary/vendor/bin/hw/vendor.display.color@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.display.color@1.0-service \
     vendor/samsung/r8q/proprietary/vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service \
-    vendor/samsung/r8q/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.iop@2.0-service \
-    vendor/samsung/r8q/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.perf@2.2-service \
     vendor/samsung/r8q/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.qseecom@1.0-service \
     vendor/samsung/r8q/proprietary/vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service \
     vendor/samsung/r8q/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 \
@@ -119,8 +117,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/etc/init/vendor.qti.cdsprpc-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.cdsprpc-service.rc \
     vendor/samsung/r8q/proprietary/vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc \
     vendor/samsung/r8q/proprietary/vendor/etc/init/vendor.qti.hardware.dsp@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.dsp@1.0-service.rc \
-    vendor/samsung/r8q/proprietary/vendor/etc/init/vendor.qti.hardware.iop@2.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.iop@2.0-service.rc \
-    vendor/samsung/r8q/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.2-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.perf@2.2-service.rc \
     vendor/samsung/r8q/proprietary/vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc \
     vendor/samsung/r8q/proprietary/vendor/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc \
     vendor/samsung/r8q/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 \
@@ -145,20 +141,11 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/etc/nfc/sec_s3nrn4v_hwreg.bin:$(TARGET_COPY_OUT_VENDOR)/etc/nfc/sec_s3nrn4v_hwreg.bin \
     vendor/samsung/r8q/proprietary/vendor/etc/nfc/sec_s3nrn4v_swreg.bin:$(TARGET_COPY_OUT_VENDOR)/etc/nfc/sec_s3nrn4v_swreg.bin \
     vendor/samsung/r8q/proprietary/vendor/etc/pdpcnt-conf.xml:$(TARGET_COPY_OUT_VENDOR)/etc/pdpcnt-conf.xml \
-    vendor/samsung/r8q/proprietary/vendor/etc/perf/commonresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonresourceconfigs.xml \
-    vendor/samsung/r8q/proprietary/vendor/etc/perf/commonsysnodesconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonsysnodesconfigs.xml \
-    vendor/samsung/r8q/proprietary/vendor/etc/perf/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml \
-    vendor/samsung/r8q/proprietary/vendor/etc/perf/perfconfigstore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfconfigstore.xml \
-    vendor/samsung/r8q/proprietary/vendor/etc/perf/targetconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetconfig.xml \
-    vendor/samsung/r8q/proprietary/vendor/etc/perf/targetresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetresourceconfigs.xml \
-    vendor/samsung/r8q/proprietary/vendor/etc/platform_boost/boost_cap.xml:$(TARGET_COPY_OUT_VENDOR)/etc/platform_boost/boost_cap.xml \
-    vendor/samsung/r8q/proprietary/vendor/etc/platform_boost/boost_mode.xml:$(TARGET_COPY_OUT_VENDOR)/etc/platform_boost/boost_mode.xml \
     vendor/samsung/r8q/proprietary/vendor/etc/plmn_delta.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_delta.bin \
     vendor/samsung/r8q/proprietary/vendor/etc/plmn_delta_attaio.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_delta_attaio.bin \
     vendor/samsung/r8q/proprietary/vendor/etc/plmn_delta_hktw.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_delta_hktw.bin \
     vendor/samsung/r8q/proprietary/vendor/etc/plmn_delta_usagsm.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_delta_usagsm.bin \
     vendor/samsung/r8q/proprietary/vendor/etc/plmn_se13.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_se13.bin \
-    vendor/samsung/r8q/proprietary/vendor/etc/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml \
     vendor/samsung/r8q/proprietary/vendor/etc/qdcm_calib_data_ss_dsi_panel_EA8079B_AMS646YB01_FHD.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_ss_dsi_panel_EA8079B_AMS646YB01_FHD.xml \
     vendor/samsung/r8q/proprietary/vendor/etc/qdcm_calib_data_ss_dsi_panel_S6E3FC3_AMS646YD01_FHD.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_ss_dsi_panel_S6E3FC3_AMS646YD01_FHD.xml \
     vendor/samsung/r8q/proprietary/vendor/etc/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \
@@ -627,9 +614,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/lib/libpantilt_detector.uniplugin@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/libpantilt_detector.uniplugin@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib/libpdmapper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libpdmapper.so \
     vendor/samsung/r8q/proprietary/vendor/lib/libpdnotifier.so:$(TARGET_COPY_OUT_VENDOR)/lib/libpdnotifier.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/libperfconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfconfig.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/libperfgluelayer.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfgluelayer.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/libperfioctl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfioctl.so \
     vendor/samsung/r8q/proprietary/vendor/lib/libperipheral_client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperipheral_client.so \
     vendor/samsung/r8q/proprietary/vendor/lib/libpredeflicker_native.so:$(TARGET_COPY_OUT_VENDOR)/lib/libpredeflicker_native.so \
     vendor/samsung/r8q/proprietary/vendor/lib/libprofileparamstorage.so:$(TARGET_COPY_OUT_VENDOR)/lib/libprofileparamstorage.so \
@@ -658,12 +642,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/lib/libqseed3.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqseed3.so \
     vendor/samsung/r8q/proprietary/vendor/lib/libqsocket.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqsocket.so \
     vendor/samsung/r8q/proprietary/vendor/lib/libqtikeymaster4.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqtikeymaster4.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/libqti-iopd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-iopd-client.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/libqti-iopd.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-iopd.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/libqti-perfd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-perfd-client.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/libqti-perfd.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-perfd.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/libqti-util.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-util.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/libqti-utils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-utils.so \
     vendor/samsung/r8q/proprietary/vendor/lib/libqti_vndfwk_detect.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti_vndfwk_detect.so \
     vendor/samsung/r8q/proprietary/vendor/lib/libqtigef.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqtigef.so \
     vendor/samsung/r8q/proprietary/vendor/lib/librecordalive.so:$(TARGET_COPY_OUT_VENDOR)/lib/librecordalive.so \
@@ -709,7 +687,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/lib/libshotsuggestion.so:$(TARGET_COPY_OUT_VENDOR)/lib/libshotsuggestion.so \
     vendor/samsung/r8q/proprietary/vendor/lib/libshotsuggestion_engines.so:$(TARGET_COPY_OUT_VENDOR)/lib/libshotsuggestion_engines.so \
     vendor/samsung/r8q/proprietary/vendor/lib/libsi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsi.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/libskewknob.so:$(TARGET_COPY_OUT_VENDOR)/lib/libskewknob.so \
     vendor/samsung/r8q/proprietary/vendor/lib/libsmartfocus_interface.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsmartfocus_interface.so \
     vendor/samsung/r8q/proprietary/vendor/lib/libsmwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsmwrapper.so \
     vendor/samsung/r8q/proprietary/vendor/lib/libsnaace.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsnaace.so \
@@ -842,8 +819,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.dsp@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.hardware.fingerprint@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.fingerprint@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.fm@1.0.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.hardware.iop@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.iop@1.0.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.hardware.iop@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.iop@2.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.hardware.qccsyshal@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.qccsyshal@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.hardware.qseecom@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.qseecom@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.hardware.qteeconnector@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.qteeconnector@1.0.so \
@@ -855,9 +830,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.3.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.vpp@1.3.so \
     vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.hardware.wigig.netperftuner@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.wigig.netperftuner@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.latency@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.latency@2.0.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.memory.pasrmanager@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.memory.pasrmanager@1.0.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.memory.pasrmanager@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.memory.pasrmanager@1.1.so \
-    vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.power.pasrmanager@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.power.pasrmanager@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib/vendor.qti.voiceprint@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.voiceprint@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib/vendor.samsung.hardware.audio@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.samsung.hardware.audio@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib/vendor.samsung.hardware.biometrics.face@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.samsung.hardware.biometrics.face@2.0.so \
@@ -1204,7 +1176,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/lib64/libkeymasterdeviceutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymasterdeviceutils.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libkeymasterutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymasterutils.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/liblbs_core.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblbs_core.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/liblearningmodule.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblearningmodule.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/liblivefocus_capture_engine.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblivefocus_capture_engine.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/liblivefocus_capture_interface.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblivefocus_capture_interface.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/liblivefocus_preview_engine.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblivefocus_preview_engine.so \
@@ -1224,7 +1195,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/lib64/libmdmdetect.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmdmdetect.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libmdmimgload.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmdmimgload.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libmdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmdsprpc.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/libmeters.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmeters.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libminkdescriptor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libminkdescriptor.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libminksocket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libminksocket.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libmm-hdcpmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmm-hdcpmgr.so \
@@ -1253,9 +1223,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/lib64/libpadm.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpadm.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libpdmapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpdmapper.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libpdnotifier.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpdnotifier.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/libperfconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperfconfig.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/libperfgluelayer.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperfgluelayer.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/libperfioctl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperfioctl.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libperipheral_client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperipheral_client.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libprofileparamstorage.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libprofileparamstorage.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libprotobuf-cpp-full-3.9.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libprotobuf-cpp-full-3.9.1.so \
@@ -1283,12 +1250,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/lib64/libqseed3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqseed3.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libqsocket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqsocket.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libqtikeymaster4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqtikeymaster4.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/libqti-iopd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-iopd-client.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/libqti-iopd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-iopd.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/libqti-perfd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-perfd-client.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/libqti-perfd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-perfd.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/libqti-util.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-util.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/libqti-utils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-utils.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libqti_vndfwk_detect.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti_vndfwk_detect.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libqtigef.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqtigef.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libreffeature.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libreffeature.so \
@@ -1334,7 +1295,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/lib64/libshotsuggestion.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libshotsuggestion.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libshotsuggestion_engines.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libshotsuggestion_engines.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libsi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsi.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/libskewknob.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libskewknob.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libsmartfocus_interface.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsmartfocus_interface.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libsnaace.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnaace.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/libsnamrnb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnamrnb.so \
@@ -1460,8 +1420,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.qmi@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.dsp@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.fm@1.0.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.hardware.iop@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.iop@1.0.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.hardware.iop@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.iop@2.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qccsyshal@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qseecom@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qteeconnector@1.0.so \
@@ -1477,9 +1435,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.hardware.vpp@1.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.vpp@1.3.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.hardware.wigig.netperftuner@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.wigig.netperftuner@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.latency@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.latency@2.0.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.memory.pasrmanager@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.memory.pasrmanager@1.0.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.memory.pasrmanager@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.memory.pasrmanager@1.1.so \
-    vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.power.pasrmanager@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.power.pasrmanager@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/vendor.qti.voiceprint@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.voiceprint@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/vendor.samsung.hardware.audio@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.samsung.hardware.audio@1.0.so \
     vendor/samsung/r8q/proprietary/vendor/lib64/vendor.samsung.hardware.biometrics.face@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.samsung.hardware.biometrics.face@2.0.so \