diff --git a/CleanSpec.mk b/CleanSpec.mk
index fe253e4d..aa65532f 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -187,3 +187,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.drm@
 # Remove healthd
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/healthd)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/healthd.rc)
+
+# Remove android.hardware.keymaster@4.0-service
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.keymaster@4.0-service)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.keymaster@4.0-service.rc)
+
diff --git a/device.mk b/device.mk
index 8cc5ffc9..59753cf3 100755
--- a/device.mk
+++ b/device.mk
@@ -188,10 +188,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     android.hardware.health@2.0-service.wahoo
 
-# Keymaster 4 (software only)
-PRODUCT_PACKAGES += \
-    android.hardware.keymaster@4.0-service
-
 # Audio fluence, ns, aec property, voice and media volume steps
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.qc.sdk.audio.fluencetype=fluencepro \
diff --git a/manifest.xml b/manifest.xml
index 8a7986d8..a1a0322a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -169,15 +169,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.keymaster</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IKeymasterDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.light</name>
         <transport>hwbinder</transport>