diff --git a/BoardConfig.mk b/BoardConfig.mk
index d06627d..f02b952 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -186,9 +186,6 @@ BOARD_HAVE_FM_RADIO := true
 BOARD_DISABLE_FMRADIO_LIBJNI := true
 TARGET_QCOM_NO_FM_FIRMWARE := true
 
-#FSG
-BOARD_ROOT_EXTRA_FOLDERS := fsg
-
 # Keymaster
 TARGET_PROVIDES_KEYMASTER := true
 
@@ -212,6 +209,12 @@ BOARD_RECOVERYIMAGE_PARTITION_SIZE := 21520384    #    20580 * 1024 mmcblk0p38
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 4294967296    #  4194304 * 1024 mmcblk0p53
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 25614597120 # 25014255 * 1024 mmcblk0p54
 
+BOARD_ROOT_EXTRA_SYMLINKS := \
+    /mnt/vendor/persist:/persist \
+    /vendor/firmware_mnt/image:firmware/image
+
+BOARD_ROOT_EXTRA_FOLDERS := fsg
+
 # Peripheral manager
 TARGET_PER_MGR_ENABLED := true
 
@@ -245,21 +248,17 @@ SELINUX_IGNORE_NEVERALLOWS := true
 #Soong
 PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH)
 
-# Thermal
-USE_DEVICE_SPECIFIC_THERMAL := true
+# Security patch level
+VENDOR_SECURITY_PATCH := 2019-08-01
 
 # Treble
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 BOARD_VENDORIMAGE_PARTITION_SIZE := 805306368
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 PRODUCT_FULL_TREBLE_OVERRIDE := true
-#PRODUCT_SHIPPING_API_LEVEL := 25
 PRODUCT_VENDOR_MOVE_ENABLED := true
 TARGET_COPY_OUT_VENDOR := vendor
 
-# Use mke2fs to create ext4 images
-TARGET_USES_MKE2FS := true
-
 # Wifi
 BOARD_HAS_QCOM_WLAN              := true
 BOARD_HAS_QCOM_WLAN_SDK          := true
@@ -272,10 +271,3 @@ WIFI_DRIVER_FW_PATH_AP           := "ap"
 WIFI_DRIVER_FW_PATH_STA          := "sta"
 WIFI_DRIVER_FW_PATH_P2P          := "p2p"
 WPA_SUPPLICANT_VERSION           := VER_0_8_X
-
-# Security patch level
-VENDOR_SECURITY_PATCH := 2019-06-01
-
-BOARD_ROOT_EXTRA_SYMLINKS := \
-	/vendor/firmware_mnt/image:firmware/image
-