diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk
index 3f8645e..0e1b9b9 100644
--- a/universal7885-common/BoardConfigCommon.mk
+++ b/universal7885-common/BoardConfigCommon.mk
@@ -70,7 +70,6 @@ BOARD_FLASH_BLOCK_SIZE := 131072
 
 # Properties
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
-TARGET_PRODUCT_PROP += $(COMMON_PATH)/product.prop
 TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop
 TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop
 
diff --git a/universal7885-common/product.prop b/universal7885-common/product.prop
deleted file mode 100644
index 10cf3d5..0000000
--- a/universal7885-common/product.prop
+++ /dev/null
@@ -1,19 +0,0 @@
-# LMKD
-ro.lmk.use_psi=false
-ro.lmk.use_minfree_levels=true
-
-# Binary XML
-persist.sys.binary_xml=false
-
-# DSDS Settings
-persist.sys.fflag.override.settings_provider_model=false
-
-# IORap
-persist.device_config.runtime_native_boot.iorap_readahead_enable=true
-
-# Graphics
-debug.cpurend.vsync=false
-
-# RCS
-persist.rcs.supported=1
-
diff --git a/universal7885-common/system.prop b/universal7885-common/system.prop
index 063ed3b..0a0f4d6 100644
--- a/universal7885-common/system.prop
+++ b/universal7885-common/system.prop
@@ -1,10 +1,20 @@
-# pre-render
-ro.vendor.perf.scroll_opt=true
-
 # ZRAM writeback
 ro.zram.mark_idle_delay_mins=60
 ro.zram.first_wb_delay_mins=360
 ro.zram.periodic_wb_delay_hours=24
 
-# Zygote preforking
-persist.device_config.runtime_native.usap_pool_enabled=true
+# LMKD
+ro.lmk.use_psi=false
+ro.lmk.use_minfree_levels=true
+
+# Binary XML
+persist.sys.binary_xml=false
+
+# DSDS Settings
+persist.sys.fflag.override.settings_provider_model=false
+
+# RCS
+persist.rcs.supported=1
+
+# Rendering
+debug.renderengine.backend=skiaglthreaded
\ No newline at end of file