diff --git a/meta-hxt/conf/layer.conf b/meta-hxt/conf/layer.conf
index ec6913a..bc33c2b 100644
--- a/meta-hxt/conf/layer.conf
+++ b/meta-hxt/conf/layer.conf
@@ -3,6 +3,3 @@
 
 BBFILE_COLLECTIONS += "hxt"
 BBFILE_PATTERN_hxt = ""
-
-# Provide a variable that points the base of the hxt layer.
-HXTBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb
index 879f7a5..a0194c8 100644
--- a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend_stardragon4800-rep2 := "${THISDIR}/${PN}:"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${HXTBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 SRC_URI += "file://stardragon4800-rep2-console-client.sh"
 
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/socupdate.bb b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/socupdate.bb
index e2ae60a..66a0755 100644
--- a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/socupdate.bb
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/socupdate.bb
@@ -3,7 +3,7 @@
 HOMEPAGE = ""
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${HXTBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 SRC_URI += "file://socupdate.sh"
 
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/workbook/stardragon4800-rep2-config.bb b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/workbook/stardragon4800-rep2-config.bb
index de5f7ae..ec8f0de 100644
--- a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/workbook/stardragon4800-rep2-config.bb
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/workbook/stardragon4800-rep2-config.bb
@@ -2,7 +2,7 @@
 DESCRIPTION = "Board wiring information for the HXT Rep system."
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${HXTBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit allarch
 inherit setuptools