diff --git a/meta-systemd/conf/layer.conf b/meta-systemd/conf/layer.conf
index c064333bf..f3fc45d00 100644
--- a/meta-systemd/conf/layer.conf
+++ b/meta-systemd/conf/layer.conf
@@ -15,17 +15,6 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "\
   ${LAYERDIR}/recipes-*/*/*.bb \
   ${LAYERDIR}/oe-core/recipes-*/*/*.bbappend \
-  ${LAYERDIR}/meta-oe/recipes-*/*/*.bbappend \
-  ${@base_contains('BBFILE_COLLECTIONS', 'systemd-layer',\
-                   '', '${LAYERDIR}/invalid.bb', d)} \
-  ${@base_contains('BBFILE_COLLECTIONS', 'gnome-layer',\
-                   '${LAYERDIR}/meta-gnome/recipes-*/*/*.bbappend', '', d)} \
-  ${@base_contains('BBFILE_COLLECTIONS', 'multimedia-layer',\
-                   '${LAYERDIR}/meta-multimedia/recipes-*/*/*.bbappend', '', d)} \
-  ${@base_contains('BBFILE_COLLECTIONS', 'networking',\
-                   '${LAYERDIR}/meta-networking/recipes-*/*/*.bbappend', '', d)} \
-  ${@base_contains('BBFILE_COLLECTIONS', 'xfce-layer',\
-                   '${LAYERDIR}/meta-xfce/recipes-*/*/*.bbappend', '', d)} \
 "
 
 BBFILE_COLLECTIONS += "systemd-layer"
diff --git a/meta-systemd/invalid.bb b/meta-systemd/invalid.bb
deleted file mode 100644
index b16787bce..000000000
--- a/meta-systemd/invalid.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-Content of this file is invalid and is used by conf/layer.conf to
-ensure that BBFILES is expanded after BBFILE_COLLECTIONS.