diff --git a/hidl/manifest_lahaina.xml b/hidl/manifest_lahaina.xml
index 32ef7dd..0c44f03 100644
--- a/hidl/manifest_lahaina.xml
+++ b/hidl/manifest_lahaina.xml
@@ -720,16 +720,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>wifiStats</instance>
         </interface>
     </hal>
-    <!-- QSPM-HAL service-->
-    <hal format="hidl">
-        <name>vendor.qti.qspmhal</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IQspmhal</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <!-- Trusted UI HAL Service -->
     <hal format="hidl">
         <name>vendor.qti.hardware.trustedui</name>
diff --git a/hidl/vendor_framework_compatibility_matrix.xml b/hidl/vendor_framework_compatibility_matrix.xml
index 1ef4893..69c8073 100644
--- a/hidl/vendor_framework_compatibility_matrix.xml
+++ b/hidl/vendor_framework_compatibility_matrix.xml
@@ -700,15 +700,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>default</instance>
         </interface>
     </hal>
-    <!-- QSPM-HAL service-->
-    <hal format="hidl" optional="true">
-        <name>vendor.qti.qspmhal</name>
-        <version>1.0</version>
-        <interface>
-            <name>IQspmhal</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
    <hal format="hidl" optional="true">
         <name>vendor.qti.diaghal</name>
         <version>1.0</version>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index a6aa476..91b21cc 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -690,13 +690,6 @@ vendor/lib64/libqmi_legacy.so
 vendor/lib64/libqmiservices.so
 vendor/lib64/libqrtr.so
 
-# QSPM
-vendor/bin/vendor.qti.qspmhal@1.0-service
-vendor/etc/init/vendor.qti.qspmhal@1.0-service.rc
-vendor/etc/seccomp_policy/qspm.policy
-vendor/lib64/vendor.qti.qspmhal@1.0-impl.so
-vendor/lib64/vendor.qti.qspmhal@1.0.so
-
 # QTI service tracker
 -vendor/etc/vintf/manifest/vendor.qti.hardware.servicetracker@1.2-service.xml
 vendor/bin/hw/vendor.qti.hardware.servicetracker@1.2-service
diff --git a/vendor.prop b/vendor.prop
index 12c11f1..bf72e9a 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -213,9 +213,6 @@ ro.vendor.perf.scroll_opt=0
 # Qcomsysd
 persist.vendor.qcomsysd.enabled=1
 
-# QSPM
-ro.vendor.qspm.enable=true
-
 # Radio
 keyguard.no_require_sim=true
 persist.radio.multisim.config=dsds