diff --git a/arch/arm64/configs/cust_defconfig b/arch/arm64/configs/cust_defconfig
index 1b8414a5bf00..deafb0b0772a 100644
--- a/arch/arm64/configs/cust_defconfig
+++ b/arch/arm64/configs/cust_defconfig
@@ -103,7 +103,6 @@ CONFIG_COMPAT=y
 CONFIG_COMPAT_VDSO=y
 CONFIG_PM_WAKELOCKS=y
 CONFIG_PM_WAKELOCKS_LIMIT=0
-CONFIG_PM_WAKELOCKS_GC=y
 CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 CONFIG_CPU_IDLE=y
 CONFIG_ARM_CPUIDLE=y
@@ -137,8 +136,8 @@ CONFIG_INET_IPCOMP=y
 CONFIG_INET_UDP_DIAG=y
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BBR=y
 CONFIG_TCP_CONG_WESTWOOD=y
+CONFIG_TCP_CONG_BBR=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -323,8 +322,6 @@ CONFIG_TUN=y
 CONFIG_VETH=y
 CONFIG_SKY2=y
 CONFIG_RMNET=y
-CONFIG_RMNET_PERF=m
-CONFIG_RMNET_SHS=m
 CONFIG_SMSC911X=y
 CONFIG_AT803X_PHY=y
 CONFIG_MICREL_PHY=y
@@ -393,10 +390,10 @@ CONFIG_POWER_RESET_QCOM=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_QPNP_QG=y
+CONFIG_SMB1398_CHARGER=y
 CONFIG_SMB1355_SLAVE_CHARGER=y
 CONFIG_QPNP_SMB5=y
 CONFIG_SMB1390_CHARGE_PUMP_PSY=y
-CONFIG_SMB1398_CHARGER=y
 CONFIG_BATT_VERIFY_BY_DS28E16=y
 CONFIG_ONEWIRE_GPIO=y
 CONFIG_THERMAL=y
@@ -542,7 +539,6 @@ CONFIG_UIO=y
 CONFIG_UIO_MSM_SHAREDMEM=y
 CONFIG_STAGING=y
 CONFIG_ASHMEM=y
-# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 CONFIG_ION=y
 CONFIG_ION_DEFER_FREE_NO_SCHED_IDLE=y
 CONFIG_QCA_CLD_WLAN=y
@@ -704,6 +700,11 @@ CONFIG_OVERLAY_FS=y
 CONFIG_INCREMENTAL_FS=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
+CONFIG_SDFAT_SUPPORT_DIR_SYNC=y
+CONFIG_SDFAT_CHECK_RO_ATTR=y
+# CONFIG_SDFAT_VIRTUAL_XATTR is not set
+# CONFIG_SDFAT_DEBUG is not set
+CONFIG_EXFAT_FS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_ECRYPT_FS=y
 CONFIG_ECRYPT_FS_MESSAGING=y
@@ -742,10 +743,6 @@ CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y
 CONFIG_CRYPTO_DEV_QCRYPTO=y
 CONFIG_CRYPTO_DEV_QCEDEV=y
 CONFIG_ARM64_CRYPTO=y
-CONFIG_ZRAM_DEFAULT_COMP_ALGORITHM="lz4"
-CONFIG_CRYPTO_LZ4=y
-CONFIG_LZ4_COMPRESS=y
-CONFIG_LZ4_DECOMPRESS=y
 CONFIG_CRYPTO_SHA1_ARM64_CE=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
@@ -753,22 +750,3 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
 CONFIG_MACH_XIAOMI_CUST=y
-CONFIG_EXFAT_FS=y
-CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_EXFAT_VIRTUAL_XATTR=y
-CONFIG_EXFAT_VIRTUAL_XATTR_SELINUX_LABEL="u:object_r:exfat:s0"
-CONFIG_SDFAT_FS=y
-CONFIG_SDFAT_DELAYED_META_DIRTY=y
-CONFIG_SDFAT_SUPPORT_DIR_SYNC=y
-CONFIG_SDFAT_DEFAULT_CODEPAGE=437
-CONFIG_SDFAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_SDFAT_CHECK_RO_ATTR=y
-CONFIG_SDFAT_ALIGNED_MPAGE_WRITE=y
-# CONFIG_SDFAT_VIRTUAL_XATTR is not set
-# CONFIG_SDFAT_DEBUG is not set
-CONFIG_SDFAT_STATISTICS=y
-CONFIG_SDFAT_UEVENT=y
-CONFIG_NLS_UTF8=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_DRM_MSM_KCAL_CTRL=y