diff --git a/configs/perfconfigstore.xml b/configs/perfconfigstore.xml
deleted file mode 100644
index 7775f52..0000000
--- a/configs/perfconfigstore.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2019 Qualcomm Technologies, Inc.
- * All Rights Reserved.
- * Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-
-<!-- This is PerfConfigsStore file which returns the value when a
-particular property name is invoked -->
-
-<!-- This file supports only Prop tag, which has the following fields
-* Name, to identify the name of the property. The names of the
-properties have been classified into Vendor and System property.
-* Value, the new value to be returned as string when respective
-property Name is called. -->
-
-<PerfConfigsStore>
-    <PerfConfigs>
-
-                <!--Vendor Properties -->
-                <Prop Name="vendor.debug.enable.lm" Value="true" />
-                <Prop Name="vendor.iop.enable_uxe" Value="1" />
-                <Prop Name="vendor.iop.enable_iop" Value="1" />
-                <Prop Name="vendor.perf.iop_v3.enable" Value="1" />
-                <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" />
-
-                <!--System Properties -->
-                <Prop Name="ro.vendor.qti.sys.fw.bg_apps_limit" Value="38" />
-                <Prop Name="ro.vendor.at_library" Value="libqti-at.so" />
-                <Prop Name="ro.vendor.iocgrp.config" Value="1" />
-                <Prop Name="ro.lmk.enable_userspace_lmk" Value="false" />
-                <Prop Name="vendor.perf.gestureflingboost.enable" Value="true" />
-
-    </PerfConfigs>
-</PerfConfigsStore>
diff --git a/device.mk b/device.mk
index 36410c7..650f71b 100644
--- a/device.mk
+++ b/device.mk
@@ -100,14 +100,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.build.fingerprint=google/flame/flame:10/QQ2A.200501.001.A3/6353761:user/release-keys
 
-# QTI Performance
-PRODUCT_BOOT_JARS += \
-    QPerformance \
-    UxPerformance
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/perfconfigstore.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/perf/perfconfigstore.xml
-
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)
diff --git a/proprietary-files.txt b/proprietary-files.txt
index cd81f4f..d5647a3 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -18,27 +18,6 @@ lib/libmmparser_lite.so
 lib/libOmxMux.so
 lib64/libmmosal.so
 
-# Perf 
-bin/perfservice
-etc/init/perfservice.rc
--framework/QPerformance.jar
--framework/UxPerformance.jar
-lib/libqti-at.so
-lib/libqti-iopd-client_system.so
-lib/libqti-util_system.so
-lib/libqti_performance.so
-lib/libqti-perfd-client_system.so
-lib64/libqti-at.so
-lib64/libqti_performance.so
-lib64/libqti-perfd-client_system.so
-lib64/libqti-iopd-client_system.so
-lib64/libqti-util_system.so
-lib64/libqti_workloadclassifiermodel.so
-product/lib/vendor.qti.hardware.iop@2.0.so
-product/lib/vendor.qti.hardware.perf@2.0.so
-product/lib64/vendor.qti.hardware.iop@2.0.so
-product/lib64/vendor.qti.hardware.perf@2.0.so
-
 # Power-off alarm
 -product/app/PowerOffAlarm/PowerOffAlarm.apk
 
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index b1c3376..cc5e752 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -68,3 +68,9 @@ service cvphalservice /system/bin/true
 
 service vendor.power-hal-1-0 /system/bin/true
     disabled
+
+service iop-hal-2-0 /system/bin/true
+    disabled
+
+service perf-hal-2-0 /system/bin/true
+    disabled
diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts
index d8ede0c..c4f6bca 100644
--- a/sepolicy/private/file_contexts
+++ b/sepolicy/private/file_contexts
@@ -2,4 +2,4 @@
 /bt_firmware(/.*)?       u:object_r:bt_firmware_file:s0
 /dsp(/.*)?               u:object_r:adsprpcd_file:s0
 /firmware(/.*)?          u:object_r:firmware_file:s0
-/persist(/.*)?           u:object_r:persist_file:s0
+/persist(/.*)?           u:object_r:persist_file:s0
\ No newline at end of file