diff --git a/BoardConfig.mk b/BoardConfig.mk
index 79dd4b9..d004fdd 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -35,7 +35,6 @@ BOARD_SUPER_PARTITION_SIZE := 8925478912
 
 # Properties
 TARGET_PRODUCT_PROP += $(DEVICE_PATH)/product.prop
-TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 
 # Recovery
diff --git a/product.prop b/product.prop
index e8d59c1..8d94385 100644
--- a/product.prop
+++ b/product.prop
@@ -1,2 +1,5 @@
+# Google
+ro.opa.device_model_id=motorola-dubai
+
 # Motorola
 ro.mot.build.customerid=global
diff --git a/system.prop b/system.prop
deleted file mode 100644
index 0397c97..0000000
--- a/system.prop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Google
-ro.opa.device_model_id=motorola-dubai
-ro.opa.eligible_device=true