diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 791e7a04..87bf400d 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -226,9 +226,6 @@ BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
 BOARD_PLAT_PUBLIC_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/public
 BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private
 
-# SurfaceFlinger
-TARGET_USE_AOSP_SURFACEFLINGER := true
-
 # Treble
 PRODUCT_FULL_TREBLE_OVERRIDE := true
 PRODUCT_VENDOR_MOVE_ENABLED := true
diff --git a/properties/common_prop.mk b/properties/common_prop.mk
index 1e712778..87d8fa8c 100644
--- a/properties/common_prop.mk
+++ b/properties/common_prop.mk
@@ -279,14 +279,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.vendor.sensors.pmd=true \
     ro.vendor.sensors.sta_detect=true
 
-# SurfaceFlinger
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.surface_flinger.use_smart_90_for_video=true \
-    ro.surface_flinger.set_display_power_timer_ms=10000 \
-    ro.surface_flinger.set_touch_timer_ms=5000 \
-    ro.surface_flinger.set_idle_timer_ms=9000 \
-    ro.surface_flinger.wcg_composition_dataspace=143261696
-
 # System restart
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.build.shutdown_timeout=2