diff --git a/manifest.xml b/manifest.xml
index 7371dea..086c78c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -125,16 +125,6 @@
         </interface>
         <fqname>@2.0::IMapper/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.keymaster</name>
-        <transport>hwbinder</transport>
-        <version>3.0</version>
-        <interface>
-            <name>IKeymasterDevice</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@3.0::IKeymasterDevice/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.light</name>
         <transport>hwbinder</transport>
diff --git a/universal7904-common.mk b/universal7904-common.mk
index 515c558..254b445 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -96,12 +96,6 @@ PRODUCT_PACKAGES += \
     init.exynos7904.usb.rc \
     ueventd.exynos7904.rc
 
-# Keymaster
-PRODUCT_PACKAGES += \
-    android.hardware.keymaster@3.0-service \
-    android.hardware.keymaster@3.0-impl \
-    libkeymaster3device
-
 # Light
 PRODUCT_PACKAGES += \
     android.hardware.light@2.0-service.samsung