diff --git a/meta-stonewither/README.md b/meta-stonewither/README.md
deleted file mode 100644
index 963404a..0000000
--- a/meta-stonewither/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Stonewither
-================
-
-This is the Stonewither machine layer.
-
-Stonewither is very similar to the 4 GPU Witherspoon system and uses the
-same motherboard.  Unlike Witherspoon, the fans and power supplies have been
-removed from the chassis and are part of the rack.
diff --git a/meta-stonewither/conf/bblayers.conf.sample b/meta-stonewither/conf/bblayers.conf.sample
deleted file mode 100644
index 61545f6..0000000
--- a/meta-stonewither/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,39 +0,0 @@
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-LCONF_VERSION = "7"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
-  ##OEROOT##/import-layers/meta-virtualization \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-stonewither \
-  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
-  ##OEROOT##/import-layers/meta-virtualization \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-stonewither \
-  "
diff --git a/meta-stonewither/conf/conf-notes.txt b/meta-stonewither/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a..0000000
--- a/meta-stonewither/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-stonewither/conf/layer.conf b/meta-stonewither/conf/layer.conf
deleted file mode 100644
index ee7760c..0000000
--- a/meta-stonewither/conf/layer.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-            ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "stonewither"
-BBFILE_PATTERN_stonewither = ""
diff --git a/meta-stonewither/conf/local.conf.sample b/meta-stonewither/conf/local.conf.sample
deleted file mode 100644
index 04fed7a..0000000
--- a/meta-stonewither/conf/local.conf.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-MACHINE ??= "stonewither"
-DISTRO ?= "openbmc-witherspoon"
-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"
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
-  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
-  "
diff --git a/meta-stonewither/conf/machine/stonewither.conf b/meta-stonewither/conf/machine/stonewither.conf
deleted file mode 100644
index de0eff2..0000000
--- a/meta-stonewither/conf/machine/stonewither.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-require conf/machine/witherspoon.conf
-
-#Use the Withespoon device tree
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-witherspoon.dtb"
-
-#No power supplies
-OBMC_POWER_SUPPLY_INSTANCES = ""
-
-#Use the witherspoon MRW XML
-MRW_XML = "witherspoon.xml"
-
-#No fans to detect
-VIRTUAL-RUNTIME_obmc-fan-presence = ""
\ No newline at end of file
diff --git a/meta-stonewither/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native%.bbappend b/meta-stonewither/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native%.bbappend
deleted file mode 100644
index 6908da7..0000000
--- a/meta-stonewither/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-PHOSPHOR_DBUS_MONITOR_CONFIGS_remove += \
-    " \
-    witherspoon-fan-policy-native \
-    witherspoon-power-supply-policy-native \
-    "
diff --git a/meta-stonewither/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-stonewither/recipes-phosphor/images/obmc-phosphor-image.bbappend
deleted file mode 100644
index 5a0e4a3..0000000
--- a/meta-stonewither/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-IMAGE_FEATURES_remove = "obmc-fan-control"
-OBMC_IMAGE_EXTRA_INSTALL_remove = "max31785-msl phosphor-msl-verify"
diff --git a/meta-stonewither/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-stonewither/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
deleted file mode 100644
index afb8507..0000000
--- a/meta-stonewither/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGES_remove += "${PN}-fan-control"
diff --git a/meta-stonewither/recipes-phosphor/workbook/stonewither-config.bb b/meta-stonewither/recipes-phosphor/workbook/stonewither-config.bb
deleted file mode 100644
index 18b3a68..0000000
--- a/meta-stonewither/recipes-phosphor/workbook/stonewither-config.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Stonewither board wiring"
-DESCRIPTION = "Board wiring information for the Stonewither OpenPOWER system."
-PR = "r1"
-
-inherit config-in-skeleton
-
-#Use Witherspoon's config
-do_make_setup() {
-        cp ${S}/Witherspoon.py \
-                ${S}/obmc_system_config.py
-        cat <<EOF > ${S}/setup.py
-from distutils.core import setup
-
-setup(name='${BPN}',
-    version='${PR}',
-    py_modules=['obmc_system_config'],
-    )
-EOF
-}
diff --git a/meta-stonewither/recipes.txt b/meta-stonewither/recipes.txt
deleted file mode 100644
index 3ec3f4a..0000000
--- a/meta-stonewither/recipes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-recipes-kernel       - The kernel and generic applications/libraries with strong kernel dependencies
-recipes-phosphor     - Phosphor OpenBMC applications and configuration