diff --git a/common.mk b/common.mk
index b032eae..db49206 100644
--- a/common.mk
+++ b/common.mk
@@ -342,8 +342,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
# Power
PRODUCT_PACKAGES += \
android.hardware.power-service-qti \
- android.hardware.power@1.2.vendor \
- vendor.qti.hardware.perf@2.3.vendor
+ android.hardware.power@1.2.vendor
PRODUCT_COPY_FILES += \
vendor/qcom/opensource/power/config/kalama/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml
diff --git a/init/init.qcom.post_boot.sh b/init/init.qcom.post_boot.sh
index e2f3215..8ca3a21 100644
--- a/init/init.qcom.post_boot.sh
+++ b/init/init.qcom.post_boot.sh
@@ -4689,8 +4689,6 @@ case "$target" in
echo N > /sys/module/lpm_levels/parameters/sleep_disabled
fi
echo N > /sys/module/lpm_levels/parameters/sleep_disabled
- # Starting io prefetcher service
- start iop
# Set Memory parameters
configure_memory_parameters
@@ -5453,7 +5451,6 @@ case "$target" in
echo 5 > /proc/sys/kernel/sched_spill_nr_run
echo 1 > /proc/sys/kernel/sched_restrict_cluster_spill
echo 1 > /proc/sys/kernel/sched_prefer_sync_wakee_to_waker
- start iop
# disable thermal bcl hotplug to switch governor
echo 0 > /sys/module/msm_thermal/core_control/enabled
diff --git a/init/init.qcom.rc b/init/init.qcom.rc
index bdd8d2b..2a90331 100644
--- a/init/init.qcom.rc
+++ b/init/init.qcom.rc
@@ -263,12 +263,6 @@ on post-fs-data
# Create directory used by display clients
mkdir /data/vendor/display 0770 system graphics
- # Change lm related dirs
- mkdir /data/vendor/lm 0700 root root
-
- # Create directory used by powermodule
- mkdir /data/vendor/pwr 0700 root root
-
# Create directory used by media clients
mkdir /data/vendor/media 0770 mediacodec media
@@ -371,18 +365,10 @@ on post-fs-data
mkdir /data/vendor/fm 0770 system system
chmod 0770 /data/vendor/fm
- #Create PERFD deamon related dirs
- mkdir /data/vendor/perfd 0770 root system
- chmod 2770 /data/vendor/perfd
- rm /data/vendor/perfd/default_values
-
mkdir /data/vendor/secure_element 0777 system system
mkdir /data/vendor/nfc 0770 nfc nfc
- #Create IOP deamon related dirs
- mkdir /data/vendor/iop 0700 root system
-
# Mark the copy complete flag to not completed
write /data/vendor/radio/copy_complete 0
chown radio radio /data/vendor/radio/copy_complete
@@ -434,13 +420,6 @@ service nqnfcinfo /system/vendor/bin/nqnfcinfo
user system
oneshot
-service iop /system/vendor/bin/iop
- class main
- user root
- group root
- disabled
- socket iop seqpacket 0666 root system
-
service vendor.ssr_setup /system/vendor/bin/ssr_setup
oneshot
disabled
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 050263b..d9d3663 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1060,57 +1060,6 @@ vendor/bin/pd-mapper
vendor/lib64/libpdmapper.so
vendor/lib64/libpdnotifier.so
-# Performance
-vendor/bin/hw/vendor.qti.hardware.perf-hal-service
-vendor/etc/init/poweropt-service.rc
-vendor/etc/init/vendor.qti.hardware.perf-hal-service.rc
-vendor/etc/lm/AdaptLaunchFeature.xml
-vendor/etc/lm/AppClassifierFeature.xml
-vendor/etc/lm/LightningLaunchesFeature.xml
-vendor/etc/lm/PreKillFeature.xml
-vendor/etc/lm/PrefAppsFeature.xml
-vendor/etc/lm/ProCompFeature.xml
-vendor/etc/lm/QGPE.xml
-vendor/etc/lm/QGPEActionMap.xml
-vendor/etc/lm/SilkyScrollsFeature.xml
-vendor/etc/lm/prekill/prekill_2GB.data
-vendor/etc/lm/prekill/prekill_4GB.data
-vendor/etc/lm/prekill/prekill_6GB.data
-vendor/etc/lm/sPLHFeature.xml
-vendor/etc/perf/avcsysnodesconfigs.xml
-vendor/etc/perf/commonresourceconfigs.xml
-vendor/etc/perf/commonsysnodesconfigs.xml
-vendor/etc/perf/perfboostsconfig.xml
-vendor/etc/perf/perfconfigstore.xml
-vendor/etc/perf/targetavcsysnodesconfigs.xml
-vendor/etc/perf/targetconfig.xml
-vendor/etc/perf/targetresourceconfigs.xml
-vendor/etc/perf/targetsysnodesconfigs.xml
-vendor/etc/perf/testcommonresourceconfigs.xml
-vendor/etc/perf/testtargetresourceconfigs.xml
-vendor/etc/pwr/AODPowerOptFeature.xml
-vendor/etc/pwr/PSMPowerOptFeature.xml
-vendor/etc/pwr/PowerFeatureConfig.xml
-vendor/etc/pwr/StandbyFeature.xml
-vendor/etc/pwr/VideoPowerOptFeature.xml
-vendor/etc/vintf/manifest/vendor.qti.hardware.perf.xml
-vendor/lib64/liblearningmodule.so
-vendor/lib64/libmeters.so
-vendor/lib64/libperfconfig.so
-vendor/lib64/libperfgluelayer.so
-vendor/lib64/libperfioctl.so
-vendor/lib64/libqti-iopd-client.so
-vendor/lib64/libqti-iopd.so
-vendor/lib64/libqti-perfd-client.so
-vendor/lib64/libqti-perfd.so
-vendor/lib64/libqti-util.so
-vendor/lib64/libqti-utils.so
-vendor/lib64/vendor.qti.hardware.iop@1.0.so
-vendor/lib64/vendor.qti.hardware.iop@2.0.so
-vendor/lib64/vendor.qti.memory.pasrmanager@1.0.so
-vendor/lib64/vendor.qti.memory.pasrmanager@1.1.so
-vendor/lib64/vendor.qti.power.pasrmanager@1.0.so
-
# Peripheral manager
vendor/bin/pm-proxy
vendor/bin/pm-service
@@ -1181,11 +1130,6 @@ vendor/lib64/libspl.so
vendor/lib64/libssd.so
vendor/lib64/vendor.qti.hardware.qseecom@1.0.so
-# QSPM
-vendor/etc/init/vendor.qti.qspmhal@1.0-service.rc
-vendor/etc/seccomp_policy/qspm.policy
-vendor/lib64/vendor.qti.qspmhal@1.0.so
-
# RIL
vendor/bin/hw/rild
vendor/bin/ipacm-diag
diff --git a/vintf/manifest_kalama.xml b/vintf/manifest_kalama.xml
index a03d582..45d6bba 100644
--- a/vintf/manifest_kalama.xml
+++ b/vintf/manifest_kalama.xml
@@ -325,16 +325,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
default
-
-
- vendor.qti.hardware.iop
- hwbinder
- 2.0
-
- IIop
- default
-
-
android.hardware.bluetooth