diff --git a/BoardConfig.mk b/BoardConfig.mk
index d638a2013dd94ea68370b06855d78e615abae7c5..c46037720aefc9a66e395719071fdf76026d653f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -56,7 +56,6 @@ TARGET_KERNEL_SOURCE := kernel/xiaomi/onclite
 TARGET_KERNEL_CONFIG := onclite-perf_defconfig
 BOARD_KERNEL_SEPARATED_DTBO := true
 BOARD_DTBOIMG_PARTITION_SIZE := 8388608
-TARGET_KERNEL_ARCH := arm64
 TARGET_KERNEL_CLANG_COMPILE := true
 TARGET_KERNEL_VERSION := 4.9
 
@@ -97,7 +96,6 @@ TARGET_NO_BOOTLOADER := true
 # Bluetooth
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
 BOARD_HAVE_BLUETOOTH_QCOM := true
-BLUETOOTH_HCI_USE_MCT := true
 TARGET_USE_QTI_BT_STACK := true
 
 # Camera
@@ -109,9 +107,6 @@ TARGET_TS_MAKEUP := true
 # Charger
 BOARD_CHARGER_DISABLE_INIT_BLANK := true
 
-# CNE / DPM
-BOARD_USES_QCNE := true
-
 # Crypto
 TARGET_HW_DISK_ENCRYPTION := true
 
@@ -120,9 +115,6 @@ TARGET_USES_ION := true
 TARGET_USES_GRALLOC1 := true
 TARGET_USES_HWC2 := true
 
-MAX_EGL_CACHE_KEY_SIZE := 12*1024
-MAX_EGL_CACHE_SIZE := 2048*1024
-
 OVERRIDE_RS_DRIVER := libRSDriver_adreno.so
 
 # DRM
@@ -211,7 +203,6 @@ BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_qcwcn
 WIFI_DRIVER_FW_PATH_AP := "ap"
 WIFI_DRIVER_FW_PATH_STA := "sta"
-WIFI_HIDL_FEATURE_DISABLE_AP_MAC_RANDOMIZATION := true
 WPA_SUPPLICANT_VERSION := VER_0_8_X
 
 # Inherit from the proprietary version