diff --git a/meta-ibm/README b/meta-ibm/README
index 14aa748..6f1b695 100644
--- a/meta-ibm/README
+++ b/meta-ibm/README
@@ -11,7 +11,6 @@
 
 BSP layer(s) for the following IBM branded servers:
 Witherspoon: meta-witherspoon
-Z: meta-z
 
 Subsequent description applies to the distro policy for IBM systems only in
 conf, classes, and recipes-*, for description of the BSP layers consult the
diff --git a/meta-ibm/meta-z/conf/bblayers.conf.sample b/meta-ibm/meta-z/conf/bblayers.conf.sample
deleted file mode 100644
index 4a117c0..0000000
--- a/meta-ibm/meta-z/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,22 +0,0 @@
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-LCONF_VERSION = "8"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-openembedded/meta-oe/   \
-  ##OEROOT##/meta-openembedded/meta-filesystems/   \
-  ##OEROOT##/meta-openembedded/meta-networking/   \
-  ##OEROOT##/meta-openembedded/meta-python/   \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-ibm/meta-fsp2 \
-  ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-ibm \
-  ##OEROOT##/meta-ibm/meta-z \
-"
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  "
diff --git a/meta-ibm/meta-z/conf/conf-notes.txt b/meta-ibm/meta-z/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a..0000000
--- a/meta-ibm/meta-z/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-ibm/meta-z/conf/layer.conf b/meta-ibm/meta-z/conf/layer.conf
deleted file mode 100644
index 7b54230..0000000
--- a/meta-ibm/meta-z/conf/layer.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-BBFILE_COLLECTIONS += "ibm-z-layer"
-BBFILE_PATTERN_ibm-z-layer := "^${LAYERDIR}/"
diff --git a/meta-ibm/meta-z/conf/local.conf.sample b/meta-ibm/meta-z/conf/local.conf.sample
deleted file mode 100644
index bd6b65b..0000000
--- a/meta-ibm/meta-z/conf/local.conf.sample
+++ /dev/null
@@ -1,17 +0,0 @@
-MACHINE ??= "ibm-z"
-DISTRO ?= "openbmc-phosphor"
-PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
-    STOPTASKS,${TMPDIR},1G,100K \
-    STOPTASKS,${DL_DIR},1G,100K \
-    STOPTASKS,${SSTATE_DIR},1G,100K \
-    STOPTASKS,/tmp,100M,100K \
-    ABORT,${TMPDIR},100M,1K \
-    ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K \
-    ABORT,/tmp,10M,1K"
-CONF_VERSION = "1"
diff --git a/meta-ibm/meta-z/conf/machine/ibm-z.conf b/meta-ibm/meta-z/conf/machine/ibm-z.conf
deleted file mode 100644
index b9d1824..0000000
--- a/meta-ibm/meta-z/conf/machine/ibm-z.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-MACHINE = "ibm-z"
-KERNEL_DEVICETREE = "fsp2.dtb"
-KBUILD_DEFCONFIG = "44x/fsp2_defconfig"
-
-require conf/machine/include/fsp2.inc
-require conf/machine/include/obmc-bsp-common.inc
-require conf/machine/include/openpower.inc
-
-UBOOT_MACHINE_sunray2 = "fsp2_defconfig"
-UBOOT_ENTRYPOINT = "0x10000000"
-UBOOT_LOADADDRESS = "0x10000000"