diff --git a/BoardConfig.mk b/BoardConfig.mk
index 21f485de..ff85faa7 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -163,12 +163,7 @@ USES_DEVICE_GOOGLE_WAHOO := true
 TARGET_USES_GRALLOC1 := true
 TARGET_USES_HWC2 := true
 
-VSYNC_EVENT_PHASE_OFFSET_NS := 2000000
-SF_VSYNC_EVENT_PHASE_OFFSET_NS := 6000000
-
 # Display
-TARGET_HAS_WIDE_COLOR_DISPLAY := false
-TARGET_HAS_HDR_DISPLAY := false
 TARGET_USES_COLOR_METADATA := true
 
 # Charger Mode
diff --git a/device.mk b/device.mk
index c4c41779..9e0921b7 100755
--- a/device.mk
+++ b/device.mk
@@ -804,12 +804,13 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES += \
     android.hardware.atrace@1.0-service
 
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_color_management=true
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.protected_contents=true
-
-# Force triple frame buffers
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.surface_flinger.max_frame_buffer_acquired_buffers=3
+# Surface flinger
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    ro.surface_flinger.max_frame_buffer_acquired_buffers=3 \
+    ro.surface_flinger.protected_contents=true \
+    ro.surface_flinger.use_color_management=true \
+    ro.surface_flinger.vsync_event_phase_offset_ns=2000000 \
+    ro.surface_flinger.vsync_sf_event_phase_offset_ns=6000000
 
 # Use /product/etc/fstab.postinstall to mount system_other.
 PRODUCT_PRODUCT_PROPERTIES += \