diff --git a/hidl/manifest_lahaina.xml b/hidl/manifest_lahaina.xml
index 6702c1056ed43aa5e340c181595025a3a7715217..47cd9c8e372456e71705f8e35473e63aa831db3a 100644
--- a/hidl/manifest_lahaina.xml
+++ b/hidl/manifest_lahaina.xml
@@ -548,16 +548,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<instance>default</instance>
</interface>
</hal>
- <!-- IOP HAL service -->
- <hal format="hidl">
- <name>vendor.qti.hardware.iop</name>
- <transport>hwbinder</transport>
- <version>2.0</version>
- <interface>
- <name>IIop</name>
- <instance>default</instance>
- </interface>
- </hal>
<!-- Secure image data processor HAL Service -->
<hal format="hidl">
<name>vendor.qti.hardware.secureprocessor.device</name>
diff --git a/hidl/vendor_framework_compatibility_matrix.xml b/hidl/vendor_framework_compatibility_matrix.xml
index e7680a5934c3509c8ec7764e69235ab6293e3783..bcd3d03ab26bdd0a163a0815ef69ca866e7567b3 100644
--- a/hidl/vendor_framework_compatibility_matrix.xml
+++ b/hidl/vendor_framework_compatibility_matrix.xml
@@ -303,14 +303,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="true">
- <name>vendor.qti.hardware.iop</name>
- <version>2.0</version>
- <interface>
- <name>IIop</name>
- <instance>default</instance>
- </interface>
- </hal>
<hal format="hidl" optional="true">
<name>vendor.qti.hardware.qdutils_disp</name>
<version>1.0</version>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index ae6112245eb79533842ba0721b54f6956c1a6cea..e9bb825bedb2891c9fa48b6e45fd520cf9b6782a 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -433,14 +433,6 @@ vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so
vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so
vendor/lib64/vendor.qti.imsrtpservice@3.0.so
-# IO prefetcher
-vendor/bin/hw/vendor.qti.hardware.iop@2.0-service
-vendor/etc/init/vendor.qti.hardware.iop@2.0-service.rc
-vendor/lib64/libqti-iopd-client.so
-vendor/lib64/libqti-iopd.so
-vendor/lib64/vendor.qti.hardware.iop@1.0.so
-vendor/lib64/vendor.qti.hardware.iop@2.0.so
-
# IPA firmware
vendor/etc/init/ipa_fws.rc
vendor/firmware/ipa_fws.b00
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 368e06c89ff834c34a3742cfe431ebf3e18db3f0..0ef0baeb8dcfb51e654b4a41dec765a68e24a39e 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -196,9 +196,6 @@ on post-fs-data
mkdir /data/vendor/secure_element 0777 system system
- # 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