diff --git a/device.mk b/device.mk
index dad5ec1..40c281c 100644
--- a/device.mk
+++ b/device.mk
@@ -63,6 +63,9 @@ PRODUCT_PACKAGES += \
 PRODUCT_BOOT_JARS += \
     qcom.fmradio
 
+PRODUCT_PRODUCT_PROPERTIES += \
+   vendor.bluetooth.soc=cherokee
+
 # HIDL
 PRODUCT_PACKAGES += \
     android.hidl.base@1.0
@@ -90,6 +93,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml
 
+# Pixel identification
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.build.fingerprint=google/flame/flame:10/QQ2A.200405.005/6254899:user/release-keys
+
 # Power
 PRODUCT_PACKAGES += \
     android.hardware.power@1.2-service-qti
@@ -106,9 +113,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)
 
-# System properties
--include $(LOCAL_PATH)/product_prop.mk
-
 # Sensors
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
@@ -142,6 +146,9 @@ PRODUCT_PACKAGES += \
 PRODUCT_BOOT_JARS += \
     WfdCommon
 
+PRODUCT_PRODUCT_PROPERTIES += \
+    debug.sf.enable_hwc_vds=1 \
+
 # Wallpapers
 PRODUCT_PACKAGES += \
     PixelLiveWallpaperPrebuilt
diff --git a/product_prop.mk b/product_prop.mk
deleted file mode 100644
index e417510..0000000
--- a/product_prop.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# Pixel identification
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.build.fingerprint=google/flame/flame:10/QQ2A.200405.005/6254899:user/release-keys
-
-# Adb
-ifeq ($(TARGET_BUILD_VARIANT),eng)
-# /vendor/default.prop is force-setting ro.adb.secure=1
-# Get rid of that by overriding it on eng builds
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.secure=0 \
-    ro.adb.secure=0
-endif
-
-# Audio
-PRODUCT_PRODUCT_PROPERTIES += \
-   ro.config.vc_call_vol_steps=7 \
-   ro.config.media_vol_steps=25
-
-# Bluetooth
-PRODUCT_PRODUCT_PROPERTIES += \
-   vendor.bluetooth.soc=cherokee
-
-# Camera
-PRODUCT_PRODUCT_PROPERTIES += \
-   persist.camera.HAL3.enabled=1
-
-# Data Modules
-PRODUCT_PRODUCT_PROPERTIES += \
-    persist.vendor.data.mode=concurrent
-
-# FM
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.vendor.fm.use_audio_session=true
-
-# Fwk detect
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.vendor.qti.va_aosp.support=1
-
-# Graphics
-PRODUCT_PRODUCT_PROPERTIES += \
-    debug.sf.enable_hwc_vds=1 \
-    debug.sf.enable_gl_backpressure=1 \
-    debug.sf.latch_unsignaled=1
-
-# Media
-PRODUCT_PRODUCT_PROPERTIES += \
-    media.settings.xml=/vendor/etc/media_profiles_vendor.xml
-
-# Netflix
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.netflix.bsp_rev=Q670-14477-1
-
-# RIL
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.telephony.default_network=22,20 \
-    persist.radio.add_power_save=1 \
-    persist.vendor.radio.lte_vrte_ltd=1 \
-    persist.vendor.radio.cs_srv_type=1 \
-    persist.vendor.radio.rat_on=combine \
-    persist.vendor.radio.force_on_dc=true \
-    persist.vendor.radio.redir_party_num=1