diff --git a/meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample b/meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample
index 409a775..330ca8a 100644
--- a/meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample
+++ b/meta-asrock/meta-e3c246d4i/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-asrock/meta-e3c256d4i/conf/templates/default/bblayers.conf.sample b/meta-asrock/meta-e3c256d4i/conf/templates/default/bblayers.conf.sample
index 0d8e82c..4bac681 100644
--- a/meta-asrock/meta-e3c256d4i/conf/templates/default/bblayers.conf.sample
+++ b/meta-asrock/meta-e3c256d4i/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-asrock/meta-romed8hm3/conf/templates/default/bblayers.conf.sample b/meta-asrock/meta-romed8hm3/conf/templates/default/bblayers.conf.sample
index fe3ebaf..7490bcc 100644
--- a/meta-asrock/meta-romed8hm3/conf/templates/default/bblayers.conf.sample
+++ b/meta-asrock/meta-romed8hm3/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-asrock/meta-spc621d8hm3/conf/templates/default/bblayers.conf.sample b/meta-asrock/meta-spc621d8hm3/conf/templates/default/bblayers.conf.sample
index 1f6e4ab..0df52d8 100644
--- a/meta-asrock/meta-spc621d8hm3/conf/templates/default/bblayers.conf.sample
+++ b/meta-asrock/meta-spc621d8hm3/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-delta/meta-ahe50dc/conf/templates/default/bblayers.conf.sample b/meta-delta/meta-ahe50dc/conf/templates/default/bblayers.conf.sample
index 58e8693..d532896 100644
--- a/meta-delta/meta-ahe50dc/conf/templates/default/bblayers.conf.sample
+++ b/meta-delta/meta-ahe50dc/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/bblayers.conf.sample
index 08b767f..d5e5c29 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/bblayers.conf.sample
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/bblayers.conf.sample
index 04e4ebb..cd266bb 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/bblayers.conf.sample
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/bblayers.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/bblayers.conf.sample
index 25854dc..86a2761 100644
--- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/bblayers.conf.sample
+++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-evb/meta-evb-raspberrypi/conf/templates/default/bblayers.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/templates/default/bblayers.conf.sample
index e6405c5..6511717 100644
--- a/meta-evb/meta-evb-raspberrypi/conf/templates/default/bblayers.conf.sample
+++ b/meta-evb/meta-evb-raspberrypi/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample
index e15c7b2..8e7a6f2 100644
--- a/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-facebook/meta-greatlakes/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-greatlakes/conf/templates/default/bblayers.conf.sample
index ce12406..714356d 100644
--- a/meta-facebook/meta-greatlakes/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-greatlakes/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-facebook/meta-harma/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-harma/conf/templates/default/bblayers.conf.sample
index b3cff84..a9ef56e 100644
--- a/meta-facebook/meta-harma/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-harma/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-facebook/meta-minerva/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-minerva/conf/templates/default/bblayers.conf.sample
index f4ffbad..7b31c83 100644
--- a/meta-facebook/meta-minerva/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-minerva/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-facebook/meta-tiogapass/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-tiogapass/conf/templates/default/bblayers.conf.sample
index 33f0d49..82f1b85 100644
--- a/meta-facebook/meta-tiogapass/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-tiogapass/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-facebook/meta-yosemite4/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-yosemite4/conf/templates/default/bblayers.conf.sample
index 0447cee..8b15a52 100644
--- a/meta-facebook/meta-yosemite4/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-yosemite4/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-facebook/meta-yosemitev2/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-yosemitev2/conf/templates/default/bblayers.conf.sample
index a655f24..8a31526 100644
--- a/meta-facebook/meta-yosemitev2/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-yosemitev2/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-hpe/meta-dl385-g11/conf/templates/default/bblayers.conf.sample b/meta-hpe/meta-dl385-g11/conf/templates/default/bblayers.conf.sample
index d951ea0..f03cff6 100644
--- a/meta-hpe/meta-dl385-g11/conf/templates/default/bblayers.conf.sample
+++ b/meta-hpe/meta-dl385-g11/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-perl \
@@ -21,7 +20,6 @@
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-perl \
diff --git a/meta-ibm/meta-genesis3/conf/templates/default/bblayers.conf.sample b/meta-ibm/meta-genesis3/conf/templates/default/bblayers.conf.sample
index c3afdeb..112076d 100644
--- a/meta-ibm/meta-genesis3/conf/templates/default/bblayers.conf.sample
+++ b/meta-ibm/meta-genesis3/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-ibm/meta-sbp1/conf/templates/default/bblayers.conf.sample b/meta-ibm/meta-sbp1/conf/templates/default/bblayers.conf.sample
index bd4b2c9..5d0a5aa 100644
--- a/meta-ibm/meta-sbp1/conf/templates/default/bblayers.conf.sample
+++ b/meta-ibm/meta-sbp1/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-ibm/meta-system1/conf/templates/default/bblayers.conf.sample b/meta-ibm/meta-system1/conf/templates/default/bblayers.conf.sample
index 29b7f04..4bc7b48 100644
--- a/meta-ibm/meta-system1/conf/templates/default/bblayers.conf.sample
+++ b/meta-ibm/meta-system1/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/templates/default/bblayers.conf.sample b/meta-intel-openbmc/meta-s2600wf/conf/templates/default/bblayers.conf.sample
index aeedde9..2bfdc1b 100644
--- a/meta-intel-openbmc/meta-s2600wf/conf/templates/default/bblayers.conf.sample
+++ b/meta-intel-openbmc/meta-s2600wf/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-inventec/meta-starscream/conf/templates/default/bblayers.conf.sample b/meta-inventec/meta-starscream/conf/templates/default/bblayers.conf.sample
index 95ea73c..c863bce 100755
--- a/meta-inventec/meta-starscream/conf/templates/default/bblayers.conf.sample
+++ b/meta-inventec/meta-starscream/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-perl \
diff --git a/meta-inventec/meta-transformers/conf/templates/default/bblayers.conf.sample b/meta-inventec/meta-transformers/conf/templates/default/bblayers.conf.sample
index 72d1ffe..a32b511 100755
--- a/meta-inventec/meta-transformers/conf/templates/default/bblayers.conf.sample
+++ b/meta-inventec/meta-transformers/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-perl \
diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc
index b830453..6061fff 100644
--- a/meta-phosphor/conf/distro/include/phosphor-base.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-base.inc
@@ -4,14 +4,6 @@
 # Match the distro codename from upstream poky.
 DISTRO_CODENAME ?= "scarthgap"
 
-# Override these in poky based distros
-POKY_DEFAULT_DISTRO_FEATURES = "opengl ptest multiarch wayland vulkan"
-POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
-POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
-
-DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
-DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
-
 DISTROOVERRIDES .= ":openbmc-phosphor"
 
 TCLIBCAPPEND = ""
diff --git a/meta-phosphor/conf/templates/default/bblayers.conf.sample b/meta-phosphor/conf/templates/default/bblayers.conf.sample
index 53243e3..de21ac1 100644
--- a/meta-phosphor/conf/templates/default/bblayers.conf.sample
+++ b/meta-phosphor/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-poky b/meta-poky
deleted file mode 120000
index 65b9a73..0000000
--- a/meta-poky
+++ /dev/null
@@ -1 +0,0 @@
-poky/meta-poky/
\ No newline at end of file
diff --git a/meta-qualcomm/conf/templates/default/bblayers.conf.sample b/meta-qualcomm/conf/templates/default/bblayers.conf.sample
index c4544fb..da842cd 100644
--- a/meta-qualcomm/conf/templates/default/bblayers.conf.sample
+++ b/meta-qualcomm/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-quanta/meta-s6q/conf/templates/default/bblayers.conf.sample b/meta-quanta/meta-s6q/conf/templates/default/bblayers.conf.sample
index 3118d50..c414b59 100644
--- a/meta-quanta/meta-s6q/conf/templates/default/bblayers.conf.sample
+++ b/meta-quanta/meta-s6q/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-skeleton b/meta-skeleton
deleted file mode 120000
index b9eb654..0000000
--- a/meta-skeleton
+++ /dev/null
@@ -1 +0,0 @@
-poky/meta-skeleton
\ No newline at end of file
diff --git a/meta-supermicro/meta-x11spi/conf/templates/default/bblayers.conf.sample b/meta-supermicro/meta-x11spi/conf/templates/default/bblayers.conf.sample
index 09488d4..2b47ec9 100644
--- a/meta-supermicro/meta-x11spi/conf/templates/default/bblayers.conf.sample
+++ b/meta-supermicro/meta-x11spi/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-ufispace/meta-ncplite/conf/templates/default/bblayers.conf.sample b/meta-ufispace/meta-ncplite/conf/templates/default/bblayers.conf.sample
index 8010e1e..ab7b33d 100644
--- a/meta-ufispace/meta-ncplite/conf/templates/default/bblayers.conf.sample
+++ b/meta-ufispace/meta-ncplite/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
diff --git a/meta-wistron/meta-lannister/conf/templates/default/bblayers.conf.sample b/meta-wistron/meta-lannister/conf/templates/default/bblayers.conf.sample
index 65e21c9..b8c694f 100644
--- a/meta-wistron/meta-lannister/conf/templates/default/bblayers.conf.sample
+++ b/meta-wistron/meta-lannister/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \