diff --git a/device.mk b/device.mk
index 4c9b138..adb3288 100644
--- a/device.mk
+++ b/device.mk
@@ -59,3 +59,6 @@ PRODUCT_PACKAGES += \
 # Thermal
 PRODUCT_COPY_FILES += \
      $(LOCAL_PATH)/configs/thermal-engine-merlin.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-merlin.conf
+
+# Get non-open-source specific aspects
+$(call inherit-product, vendor/motorola/merlin/merlin-vendor.mk)
diff --git a/full_merlin.mk b/full_merlin.mk
deleted file mode 100644
index 894f41c..0000000
--- a/full_merlin.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2015 The CyanogenMod Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Inherit from merlin device
-$(call inherit-product, device/motorola/merlin/device.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := merlin
-PRODUCT_NAME := full_merlin
-
-$(call inherit-product-if-exists, vendor/motorola/merlin/merlin-vendor.mk)
diff --git a/lineage_merlin.mk b/lineage_merlin.mk
index 3b1c203..2eea187 100644
--- a/lineage_merlin.mk
+++ b/lineage_merlin.mk
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$(call inherit-product, device/motorola/merlin/full_merlin.mk)
+$(call inherit-product, device/motorola/merlin/device.mk)
 
 # Boot animation
 TARGET_BOOTANIMATION_HALF_RES := true