diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index d521feba86d9556a361c2d7403e1c243fa017e32..a1d4f15db50711bbc801248c12808acc9f19b03b 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -72,13 +72,6 @@ BOARD_DTBOIMG_PARTITION_SIZE := 8388608
 BOARD_SUPER_PARTITION_GROUPS := mtk_dynamic_partitions
 BOARD_MTK_DYNAMIC_PARTITIONS_PARTITION_LIST := product system vendor
 
-ifneq ($(WITH_GMS),true)
-BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT := -1
-BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 805306368
-BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT := -1
-BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 805306368
-endif
-
 BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
@@ -109,43 +102,5 @@ VENDOR_SECURITY_PATCH := 2021-10-05
 include device/mediatek/sepolicy/BoardSEPolicyConfig.mk
 BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
 
-# Verified Boot
-BOARD_AVB_ENABLE := true
-ifeq (eng,$(TARGET_BUILD_VARIANT))
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3
-endif
-
-BOARD_AVB_ALGORITHM := SHA256_RSA2048
-ifneq (,$(wildcard $(KEYS_DIR)/avb_rsa2048.pem))
-BOARD_AVB_KEY_PATH := $(KEYS_DIR)/avb_rsa2048.pem
-else
-BOARD_AVB_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
-endif
-BOARD_AVB_ROLLBACK_INDEX := 0
-
-BOARD_AVB_BOOT_ALGORITHM := $(BOARD_AVB_ALGORITHM)
-BOARD_AVB_BOOT_KEY_PATH := $(BOARD_AVB_KEY_PATH)
-BOARD_AVB_BOOT_ROLLBACK_INDEX := 0
-BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 3
-
-BOARD_AVB_VBMETA_SYSTEM := product system
-BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := $(BOARD_AVB_KEY_PATH)
-BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := $(BOARD_AVB_ALGORITHM)
-BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := 0
-BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 2
-BOARD_AVB_VBMETA_VENDOR := vendor
-BOARD_AVB_VBMETA_VENDOR_KEY_PATH := $(BOARD_AVB_KEY_PATH)
-BOARD_AVB_VBMETA_VENDOR_ALGORITHM := SHA256_RSA2048
-BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX := 0
-BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX_LOCATION := 4
-BOARD_AVB_RECOVERY_KEY_PATH := $(BOARD_AVB_KEY_PATH)
-BOARD_AVB_RECOVERY_ALGORITHM := $(BOARD_AVB_ALGORITHM)
-BOARD_AVB_RECOVERY_ROLLBACK_INDEX := 0
-BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION := 1
-
-BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS := --hash_algorithm sha256
-BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS := --hash_algorithm sha256
-BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS := --hash_algorithm sha256
-
 # Inherit the proprietary files
 include vendor/teracube/mt6765-common/BoardConfigVendor.mk