diff --git a/Android.bp b/Android.bp
index 3e781ba..5df5ed1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6019,74 +6019,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libqti-iopd-client",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libqti-iopd-client.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "libutils",
-                "libxml2",
-                "libqti-util",
-                "liblog",
-                "vendor.qti.hardware.iop@2.0",
-                "libhidlbase",
-                "libsqlite",
-                "libqti-perfd-client",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libqti-iopd",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libqti-iopd.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "libutils",
-                "libxml2",
-                "libqti-util",
-                "liblog",
-                "libhidlbase",
-                "vendor.qti.hardware.iop@2.0",
-                "libbase",
-                "libqti-iopd-client",
-                "libqti-perfd-client",
-                "libsqlite",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libqtikeymaster4",
     owner: "motorola",
@@ -8513,34 +8445,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.iop@2.0",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.qti.hardware.iop@2.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.qti.hardware.mwqemadapter@1.0",
     owner: "motorola",
@@ -11883,40 +11787,6 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
-cc_prebuilt_binary {
-    name: "vendor.qti.hardware.iop@2.0-service",
-    owner: "motorola",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service",
-            ],
-            shared_libs: [
-                "liblog",
-                "libcutils",
-                "libbase",
-                "libutils",
-                "libhardware_legacy",
-                "libhardware",
-                "libhidlbase",
-                "libqti-perfd-client",
-                "vendor.qti.hardware.iop@2.0",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    relative_install_path: "hw",
-    soc_specific: true,
-}
-
 cc_prebuilt_binary {
     name: "vendor.qti.hardware.perf@2.2-service",
     owner: "motorola",
diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service b/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service
deleted file mode 100755
index 616b172..0000000
Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service and /dev/null differ
diff --git a/proprietary/vendor/etc/init/vendor.qti.hardware.iop@2.0-service.rc b/proprietary/vendor/etc/init/vendor.qti.hardware.iop@2.0-service.rc
deleted file mode 100644
index 6863556..0000000
--- a/proprietary/vendor/etc/init/vendor.qti.hardware.iop@2.0-service.rc
+++ /dev/null
@@ -1,14 +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
-    class hal
-    user root
-    group root readproc
diff --git a/proprietary/vendor/lib64/libqti-iopd-client.so b/proprietary/vendor/lib64/libqti-iopd-client.so
deleted file mode 100644
index 1889c18..0000000
Binary files a/proprietary/vendor/lib64/libqti-iopd-client.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libqti-iopd.so b/proprietary/vendor/lib64/libqti-iopd.so
deleted file mode 100644
index b9a54e0..0000000
Binary files a/proprietary/vendor/lib64/libqti-iopd.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.iop@2.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.iop@2.0.so
deleted file mode 100644
index dd79750..0000000
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.iop@2.0.so and /dev/null differ
diff --git a/sm6225-common-vendor.mk b/sm6225-common-vendor.mk
index 1873f2b..798dd4c 100644
--- a/sm6225-common-vendor.mk
+++ b/sm6225-common-vendor.mk
@@ -84,7 +84,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm6225-common/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.alarm@1.0-service.rc \
     vendor/motorola/sm6225-common/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/motorola/sm6225-common/proprietary/vendor/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc \
-    vendor/motorola/sm6225-common/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/motorola/sm6225-common/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/motorola/sm6225-common/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/motorola/sm6225-common/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 \
@@ -336,8 +335,6 @@ PRODUCT_PACKAGES += \
     libqrtr \
     libqseed3 \
     libqsocket \
-    libqti-iopd-client \
-    libqti-iopd \
     libqtikeymaster4 \
     librcc \
     libril-qc-hal-qmi \
@@ -416,7 +413,6 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.data.lce@1.0 \
     vendor.qti.hardware.data.qmi@1.0 \
     vendor.qti.hardware.fm@1.0_vendor \
-    vendor.qti.hardware.iop@2.0 \
     vendor.qti.hardware.mwqemadapter@1.0 \
     vendor.qti.hardware.qccsyshal@1.0 \
     vendor.qti.hardware.qseecom@1.0 \
@@ -555,7 +551,6 @@ PRODUCT_PACKAGES += \
     vendor.display.color@1.0-service \
     vendor.qti.hardware.alarm@1.0-service \
     vendor.qti.hardware.capabilityconfigstore@1.0-service \
-    vendor.qti.hardware.iop@2.0-service \
     vendor.qti.hardware.perf@2.2-service \
     vendor.qti.hardware.qseecom@1.0-service \
     vendor.qti.hardware.qteeconnector@1.0-service \