diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 03c9ea6..30e54bb 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -173,12 +173,8 @@ TARGET_ENABLE_MEDIADRM_64 := true
 TARGET_USES_HWC2 := true
 TARGET_USES_ION := true
 TARGET_DISABLED_UBWC := true
-BOARD_USES_ADRENO := true
-
-# Fingerprint
-BUILD_FINGERPRINT := "samsung/a52qnsxx/qssi:12/SP1A.210812.016/A525FXXU4BVG1:user/release-keys"
-PRIVATE_BUILD_DESC := "a52qnsxx-user 12 SP1A.210812.016 A525FXXU4BVG1 release-keys"
 
+# Security patch
 VENDOR_SECURITY_PATCH := 2022-07-01
 
 # FM
@@ -200,10 +196,6 @@ include device/qcom/sepolicy_vndr/SEPolicy.mk
 BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
 SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/public
 
-# Treble
-BOARD_VNDK_VERSION := current
-BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
-
 # Wifi
 BOARD_WLAN_DEVICE := qcwcn
 BOARD_HOSTAPD_DRIVER := NL80211
diff --git a/extract-files.sh b/extract-files.sh
index 2bcd6e9..855c20f 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -60,14 +60,15 @@ extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTIO
 # Fix proprietary blobs
 BLOB_ROOT="$ANDROID_ROOT"/vendor/"$VENDOR"/"$DEVICE_COMMON"/proprietary
 
-# Replace libutils with vndk30 libutils
-"${PATCHELF}" --replace-needed libutils.so libutils-v30.so $BLOB_ROOT/vendor/lib64/hw/android.hardware.health@2.0-impl-2.1-samsung.so
-
 function blob_fixup() {
     case "${1}" in
         vendor/lib64/libsec-ril.so)
             sed -i 's/ril.dds.call.ongoing/vendor.calls.ongoing/g' "${2}"
             ;;
+        vendor/lib64/hw/android.hardware.health@2.0-impl-2.1-samsung.so)
+            # Replace libutils with vndk30 libutils
+            "${PATCHELF}" --replace-needed libutils.so libutils-v30.so "${2}"
+            ;;
     esac
 }
 
diff --git a/system.prop b/system.prop
index 2aa0b42..023d23a 100644
--- a/system.prop
+++ b/system.prop
@@ -1,4 +1,4 @@
-# idk
+# RIL
 ro.vendor.qti.va_aosp.support=1
 
 # Netflix