diff --git a/meta-intel/conf/layer.conf b/meta-intel/conf/layer.conf
index 99a6df0..6605799 100644
--- a/meta-intel/conf/layer.conf
+++ b/meta-intel/conf/layer.conf
@@ -9,6 +9,3 @@
 BBFILE_PATTERN_intel = ""
 LAYERVERSION_intel = "1"
 LAYERSERIES_COMPAT_intel = "thud warrior"
-
-# Provide a variable that points the base of the intel layer.
-INTELBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb b/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb
index ce95082..0d1d016 100644
--- a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb
+++ b/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb
@@ -2,7 +2,7 @@
 DESCRIPTION="Add the /com/intel path namespace and \
 com.intel interface prefix to the mapper watch list."
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit phosphor-mapper
 inherit native
diff --git a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb b/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
index 8ef3a5d..20df118 100644
--- a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
+++ b/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
@@ -5,7 +5,7 @@
 inherit obmc-phosphor-utils
 
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 PROVIDES += "virtual/phosphor-led-manager-config-native"