diff --git a/hidl/manifest_lahaina.xml b/hidl/manifest_lahaina.xml
index 6702c10..47cd9c8 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 e7680a5..bcd3d03 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 ae61122..e9bb825 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 368e06c..0ef0bae 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