diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0a63736..319d7c3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -9,9 +9,6 @@
 
 DEVICE_PATH := device/sony/xz2c
 
-# Crypto
-TARGET_HW_DISK_ENCRYPTION := true
-
 # Display
 TARGET_SCREEN_DENSITY := 480
 
diff --git a/device.mk b/device.mk
index f0182c0..a6663c3 100644
--- a/device.mk
+++ b/device.mk
@@ -37,10 +37,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/sound_trigger_mixer_paths_wcd9340.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9340.xml \
     $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml
 
-# HW crypto
-PRODUCT_PACKAGES += \
-    vendor.qti.hardware.cryptfshw@1.0-service-qti.qsee
-
 # Input
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/idc/clearpad.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/clearpad.idc \
diff --git a/manifest.xml b/manifest.xml
index 7c9162f..3f04820 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -49,13 +49,4 @@
             <instance>gnss_vendor</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>vendor.qti.hardware.cryptfshw</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ICryptfsHw</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
 </manifest>