diff --git a/cat/cat_s22/BoardConfig.mk b/cat/cat_s22/BoardConfig.mk
index db8e668..d05bedf 100644
--- a/cat/cat_s22/BoardConfig.mk
+++ b/cat/cat_s22/BoardConfig.mk
@@ -1,9 +1,3 @@
-TARGET_ARCH := arm
-TARGET_ARCH_VARIANT := armv7-a-neon
-TARGET_CPU_VARIANT := generic
-TARGET_CPU_ABI := armeabi-v7a
-TARGET_CPU_ABI2 := armeabi
-
 # BoardConfigMgsiCommon.mk
 #
 # Common compile-time definitions for MGSI
@@ -13,7 +7,13 @@ TARGET_CPU_ABI2 := armeabi
 include build/make/target/board/BoardConfigGsiCommon.mk
 #include build/make/target/board/BoardConfigMainlineCommon.mk
 
-TARGET_NO_KERNEL := true
+TARGET_ARCH := arm
+TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_CPU_VARIANT := generic
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_CPU_ABI2 := armeabi
+
+#TARGET_NO_KERNEL := true
 
 # This flag is set by mainline but isn't desired for MGSI.
 #BOARD_USES_SYSTEM_OTHER_ODEX :=
@@ -27,23 +27,23 @@ TARGET_NO_KERNEL := true
 #BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
 
 # MGSI forces product and system_ext packages to /system for now.
-TARGET_COPY_OUT_PRODUCT := system/product
-TARGET_COPY_OUT_SYSTEM_EXT := system/system_ext
+#TARGET_COPY_OUT_PRODUCT := system/product
+#TARGET_COPY_OUT_SYSTEM_EXT := system/system_ext
 
 # Creates metadata partition mount point under root for
 # the devices with metadata parition
-BOARD_USES_METADATA_PARTITION := true
+#BOARD_USES_METADATA_PARTITION := true
 
 # Android Verified Boot (AVB):
 #   Set the rollback index to zero, to prevent the device bootloader from
 #   updating the last seen rollback index in the tamper-evident storage.
-BOARD_AVB_ROLLBACK_INDEX := 0
+#BOARD_AVB_ROLLBACK_INDEX := 0
 
 # Enable chain partition for system.
-BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
-BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048
-BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
-BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
+#BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
+#BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048
+#BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
+#BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
 
 # MGSI specific System Properties
 #ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
@@ -54,18 +54,18 @@ BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
 
 # Set this to create /cache mount point for non-A/B devices that mounts /cache.
 # The partition size doesn't matter, just to make build pass.
-BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216
+#BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
+#BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216
 
 # Setup a vendor image to let PRODUCT_PROPERTY_OVERRIDES does not affect MGSI
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+#BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 
 # Disable 64 bit mediadrmserver
 TARGET_ENABLE_MEDIADRM_64 :=
 
 # Ordinary (non-flattened) APEX may require kernel changes. For maximum compatibility,
 # use flattened APEX for MGSI
-TARGET_FLATTEN_APEX := true
+#TARGET_FLATTEN_APEX := true
 
 TARGET_SYSTEM_PROP := device/wephone/cat/system.prop $(TARGET_SYSTEM_PROP)