Move common build configuration to common
diff --git a/cm.mk b/cm.mk
index f0efbfc..f193501 100644
--- a/cm.mk
+++ b/cm.mk
@@ -1,19 +1,9 @@
-# Release name
-PRODUCT_RELEASE_NAME := Samsung Galaxy Grand Prime
-
-# Boot animation
-TARGET_SCREEN_WIDTH := 540
-TARGET_SCREEN_HEIGHT := 960
+# Inherit from common
+$(call inherit-product, device/samsung/gprimelte-common/cm.mk)
$(call inherit-product, device/samsung/gprimeltecan/full_gprimeltecan.mk)
-# Enhanced NFC
-$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
-
-# Inherit some common CM stuff.
-$(call inherit-product, vendor/cm/config/common_full_phone.mk)
-
## Device identifier. This must come after all inclusions
PRODUCT_DEVICE := gprimeltecan
PRODUCT_NAME := cm_gprimeltecan
diff --git a/full_gprimeltecan.mk b/full_gprimeltecan.mk
index 1a6f729..e87c4f4 100644
--- a/full_gprimeltecan.mk
+++ b/full_gprimeltecan.mk
@@ -14,9 +14,6 @@
# limitations under the License.
#
-# Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
-
# Inherit from device.mk
$(call inherit-product, device/samsung/gprimeltecan/device.mk)