diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 4b4404d0..7ed00316 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -102,9 +102,6 @@ BOARD_USES_QCNE := true
 # ConfigFS
 TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/configs/config.fs
 
-# Crypto
-TARGET_HW_DISK_ENCRYPTION := true
-
 # Display
 BOARD_USES_ADRENO := true
 TARGET_USES_HWC2 := true
diff --git a/manifest.xml b/manifest.xml
index 33b0c2f2..05d7f74b 100755
--- a/manifest.xml
+++ b/manifest.xml
@@ -534,15 +534,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>default</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>
     <hal format="hidl">
         <name>vendor.qti.hardware.bluetooth_sar</name>
         <transport>hwbinder</transport>
diff --git a/sdm660.mk b/sdm660.mk
index 60386b1d..6049dbf5 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -208,10 +208,6 @@ PRODUCT_PACKAGES += \
     android.hidl.base@1.0 \
     android.hidl.base@1.0_vendor
 
-# HW crypto
-PRODUCT_PACKAGES += \
-    vendor.qti.hardware.cryptfshw@1.0-service-qti.qsee
-
 # IDC
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/idc/uinput-fpc.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-fpc.idc \