diff --git a/meta-intel/conf/layer.conf b/meta-intel/conf/layer.conf
deleted file mode 100644
index b19eca2..0000000
--- a/meta-intel/conf/layer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
-            ${LAYERDIR}/meta-common/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "intel"
-BBFILE_PATTERN_intel = ""
-LAYERVERSION_intel = "1"
diff --git a/meta-intel/conf/machine/include/intel.inc b/meta-intel/conf/machine/include/intel.inc
deleted file mode 100644
index 0884294..0000000
--- a/meta-intel/conf/machine/include/intel.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-OBMC_MACHINE_FEATURES += "\
-        obmc-phosphor-fan-mgmt \
-        obmc-phosphor-chassis-mgmt \
-        obmc-phosphor-flash-mgmt \
-        obmc-host-ipmi \
-        obmc-host-ctl \
-        obmc-host-state-mgmt \
-        obmc-chassis-state-mgmt \
-        obmc-bmc-state-mgmt \
-        "
-
-VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
-
-PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-intel-apps"
-PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-intel-apps"
-PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-intel-apps"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-intel-apps"
-PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host"
-PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = ""
-#PREFERRED_PROVIDER_virtual/obmc-gpio-monitor ?= "phosphor-gpio-monitor"
diff --git a/meta-intel/meta-common/recipes-intel/boost-dbus/boost-dbus.bb b/meta-intel/meta-common/recipes-intel/boost-dbus/boost-dbus.bb
deleted file mode 100644
index 579579b..0000000
--- a/meta-intel/meta-common/recipes-intel/boost-dbus/boost-dbus.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE = "BSL-1.0"
-LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
-
-SRC_URI = "gitsm://github.com/openbmc/boost-dbus.git"
-
-PV = "1.0+git${SRCPV}"
-SRCREV = "2ec80375259500c43f5a7c620cb34cd894f7836c"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "dbus boost gtest "
-
-inherit cmake
-
-FILES_${PN}-dev += "${libdir}/cmake/boost-dbus/*"
diff --git a/meta-intel/meta-common/recipes-intel/libtinyxml2/libtinyxml2_%.bbappend b/meta-intel/meta-common/recipes-intel/libtinyxml2/libtinyxml2_%.bbappend
deleted file mode 100644
index 60cfe5e..0000000
--- a/meta-intel/meta-common/recipes-intel/libtinyxml2/libtinyxml2_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-# update libtinyxml2 to version 6.0.0
-SRCREV = "8c8293ba8969a46947606a93ff0cb5a083aab47a"
-FILES_${PN}-dev += "${libdir}/cmake/tinyxml2/*"
diff --git a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
deleted file mode 100644
index 507f149..0000000
--- a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-SUMMARY = "OpenBMC for Intel - Applications"
-PR = "r1"
-
-inherit packagegroup
-inherit obmc-phosphor-license
-
-PROVIDES = "${PACKAGES}"
-PACKAGES = " \
-        ${PN}-chassis \
-        ${PN}-fans \
-        ${PN}-flash \
-        ${PN}-system \
-        "
-
-PROVIDES += "virtual/obmc-chassis-mgmt"
-PROVIDES += "virtual/obmc-fan-mgmt"
-PROVIDES += "virtual/obmc-flash-mgmt"
-PROVIDES += "virtual/obmc-system-mgmt"
-
-RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt"
-RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt"
-RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt"
-RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt"
-
-SUMMARY_${PN}-chassis = "Intel Chassis"
-RDEPENDS_${PN}-chassis = " \
-        obmc-button-power \
-        obmc-button-reset \
-        obmc-control-chassis \
-        obmc-op-control-power \
-        obmc-host-failure-reboots \
-        "
-
-SUMMARY_${PN}-fans = "Intel Fans"
-RDEPENDS_${PN}-fans = " \
-        obmc-control-fan \
-        "
-
-SUMMARY_${PN}-flash = "Intel Flash"
-RDEPENDS_${PN}-flash = " \
-        obmc-flash-bmc \
-        obmc-mgr-download \
-        obmc-control-bmc \
-        "
-
-SUMMARY_${PN}-system = "Intel System"
-RDEPENDS_${PN}-system = " \
-        obmc-mgr-system \
-        bmcweb \
-        phosphor-webui \
-        "
diff --git a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend b/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend
deleted file mode 100644
index 54dc73d..0000000
--- a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-RDEPENDS_${PN}-extras_remove = " \
-       phosphor-rest \
-       phosphor-gevent \
-       "
diff --git a/meta-intel/meta-s2600wf/conf/bblayers.conf.sample b/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
deleted file mode 100644
index 5f4301b..0000000
--- a/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,21 +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##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-x86 \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-intel \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf \
-"
diff --git a/meta-intel/meta-s2600wf/conf/conf-notes.txt b/meta-intel/meta-s2600wf/conf/conf-notes.txt
deleted file mode 100644
index 5314bf4..0000000
--- a/meta-intel/meta-s2600wf/conf/conf-notes.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Common targets are:
-    obmc-phosphor-image
-    virtual/kernel
-    phosphor-ipmi-host
diff --git a/meta-intel/meta-s2600wf/conf/layer.conf b/meta-intel/meta-s2600wf/conf/layer.conf
deleted file mode 100644
index 75954f6..0000000
--- a/meta-intel/meta-s2600wf/conf/layer.conf
+++ /dev/null
@@ -1,10 +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 += "s2600wf"
-BBFILE_PATTERN_s2600wf = ""
-BBFILE_PRIORITY_s2600wf = "5"
diff --git a/meta-intel/meta-s2600wf/conf/local.conf.sample b/meta-intel/meta-s2600wf/conf/local.conf.sample
deleted file mode 100644
index 6c0c977..0000000
--- a/meta-intel/meta-s2600wf/conf/local.conf.sample
+++ /dev/null
@@ -1,241 +0,0 @@
-#
-# This file is your local configuration file and is where all local user settings
-# are placed. The comments in this file give some guide to the options a new user
-# to the system might want to change but pretty much any configuration option can
-# be set in this file. More adventurous users can look at local.conf.extended
-# which contains other examples of configuration which can be placed in this file
-# but new users likely won't need any of them initially.
-#
-# Lines starting with the '#' character are commented out and in some cases the
-# default values are provided as comments to show people example syntax. Enabling
-# the option is a question of removing the # character and making any change to the
-# variable as required.
-
-#
-# Machine Selection
-#
-# You need to select a specific machine to target the build with. There are a selection
-# of emulated machines available which can boot and run in the QEMU emulator:
-#
-#MACHINE ?= "qemuarm"
-#MACHINE ?= "qemuarm64"
-#MACHINE ?= "qemumips"
-#MACHINE ?= "qemuppc"
-#MACHINE ?= "qemux86"
-#MACHINE ?= "qemux86-64"
-#
-# There are also the following hardware board target machines included for
-# demonstration purposes:
-#
-#MACHINE ?= "beaglebone"
-#MACHINE ?= "genericx86"
-#MACHINE ?= "genericx86-64"
-#MACHINE ?= "mpc8315e-rdb"
-#MACHINE ?= "edgerouter"
-#
-# This sets the default machine to be qemux86 if no other machine is selected:
-
-MACHINE ?= "s2600wf"
-
-#
-# Where to place downloads
-#
-# During a first build the system will download many different source code tarballs
-# from various upstream projects. This can take a while, particularly if your network
-# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
-# can preserve this directory to speed up this part of subsequent builds. This directory
-# is safe to share between multiple builds on the same machine too.
-#
-# The default is a downloads directory under TOPDIR which is the build directory.
-#
-#DL_DIR ?= "${TOPDIR}/downloads"
-#
-# Where to place shared-state files
-#
-# BitBake has the capability to accelerate builds based on previously built output.
-# This is done using "shared state" files which can be thought of as cache objects
-# and this option determines where those files are placed.
-#
-# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
-# from these files if no changes were made to the configuration. If changes were made
-# to the configuration, only shared state files where the state was still valid would
-# be used (done using checksums).
-#
-# The default is a sstate-cache directory under TOPDIR.
-#
-#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
-
-#
-# Where to place the build output
-#
-# This option specifies where the bulk of the building work should be done and
-# where BitBake should place its temporary files and output. Keep in mind that
-# this includes the extraction and compilation of many applications and the toolchain
-# which can use Gigabytes of hard disk space.
-#
-# The default is a tmp directory under TOPDIR.
-#
-#TMPDIR = "${TOPDIR}/tmp"
-
-#
-# Default policy config
-#
-# The distribution setting controls which policy settings are used as defaults.
-# The default value is fine for general Yocto project use, at least initially.
-# Ultimately when creating custom policy, people will likely end up subclassing
-# these defaults.
-#
-DISTRO ?= "openbmc-phosphor"
-# As an example of a subclass there is a "bleeding" edge policy configuration
-# where many versions are set to the absolute latest code from the upstream
-# source control systems. This is just mentioned here as an example, its not
-# useful to most new users.
-# DISTRO ?= "poky-bleeding"
-
-#
-# Package Management configuration
-#
-# This variable lists which packaging formats to enable. Multiple package backends
-# can be enabled at once and the first item listed in the variable will be used
-# to generate the root filesystems.
-# Options are:
-#  - 'package_deb' for debian style deb files
-#  - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
-#  - 'package_rpm' for rpm style packages
-# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
-# We default to rpm:
-PACKAGE_CLASSES ?= "package_rpm"
-
-#
-# SDK/ADT target architecture
-#
-# This variable specifies the architecture to build SDK/ADT items for and means
-# you can build the SDK packages for architectures other than the machine you are
-# running the build on (i.e. building i686 packages on an x86_64 host).
-# Supported values are i686 and x86_64
-#SDKMACHINE ?= "i686"
-SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*"
-
-#
-# Extra image configuration defaults
-#
-# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated
-# images. Some of these options are added to certain image types automatically. The
-# variable can contain the following options:
-#  "dbg-pkgs"       - add -dbg packages for all installed packages
-#                     (adds symbol information for debugging/profiling)
-#  "dev-pkgs"       - add -dev packages for all installed packages
-#                     (useful if you want to develop against libs in the image)
-#  "ptest-pkgs"     - add -ptest packages for all ptest-enabled packages
-#                     (useful if you want to run the package test suites)
-#  "tools-sdk"      - add development tools (gcc, make, pkgconfig etc.)
-#  "tools-debug"    - add debugging tools (gdb, strace)
-#  "eclipse-debug"  - add Eclipse remote debugging support
-#  "tools-profile"  - add profiling tools (oprofile, exmap, lttng, valgrind)
-#  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
-#  "debug-tweaks"   - make an image suitable for development
-#                     e.g. ssh root access has a blank password
-# There are other application targets that can be used here too, see
-# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
-# We default to enabling the debugging tweaks.
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-
-#
-# Additional image features
-#
-# The following is a list of additional classes to use when building images which
-# enable extra features. Some available options which can be included in this variable
-# are:
-#   - 'buildstats' collect build statistics
-#   - 'image-mklibs' to reduce shared library files size for an image
-#   - 'image-prelink' in order to prelink the filesystem image
-#   - 'image-swab' to perform host system intrusion detection
-# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
-# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-
-#
-# Runtime testing of images
-#
-# The build system can test booting virtual machine images under qemu (an emulator)
-# after any root filesystems are created and run tests against those images. To
-# enable this uncomment this line. See classes/testimage(-auto).bbclass for
-# further details.
-#TEST_IMAGE = "1"
-#
-# Interactive shell configuration
-#
-# Under certain circumstances the system may need input from you and to do this it
-# can launch an interactive shell. It needs to do this since the build is
-# multithreaded and needs to be able to handle the case where more than one parallel
-# process may require the user's attention. The default is iterate over the available
-# terminal types to find one that works.
-#
-# Examples of the occasions this may happen are when resolving patches which cannot
-# be applied, to use the devshell or the kernel menuconfig
-#
-# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
-# Note: currently, Konsole support only works for KDE 3.x due to the way
-# newer Konsole versions behave
-#OE_TERMINAL = "auto"
-# By default disable interactive patch resolution (tasks will just fail instead):
-PATCHRESOLVE = "noop"
-
-#
-# Disk Space Monitoring during the build
-#
-# Monitor the disk space during the build. If there is less that 1GB of space or less
-# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
-# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort
-# of the build. The reason for this is that running completely out of space can corrupt
-# files and damages the build in ways which may not be easily recoverable.
-# It's necessary to monitor /tmp, if there is no space left the build will fail
-# with very exotic errors.
-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"
-
-#
-# Shared-state files from other locations
-#
-# As mentioned above, shared state files are prebuilt cache data objects which can
-# used to accelerate build time. This variable can be used to configure the system
-# to search other mirror locations for these objects before it builds the data itself.
-#
-# This can be a filesystem directory, or a remote url such as http or ftp. These
-# would contain the sstate-cache results from previous builds (possibly from other
-# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the
-# cache locations to check for the shared objects.
-# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH
-# at the end as shown in the examples below. This will be substituted with the
-# correct path within the directory structure.
-#SSTATE_MIRRORS ?= "\
-#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
-#file://.* file:///some/local/dir/sstate/PATH"
-
-#
-# Qemu configuration
-#
-# By default qemu will build with a builtin VNC server where graphical output can be
-# seen. The two lines below enable the SDL backend too. This assumes there is a
-# libsdl library available on your build system.
-PACKAGECONFIG_append_pn-qemu-native = " sdl"
-PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
-#ASSUME_PROVIDED += "libsdl-native"
-
-# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
-# track the version of this file when it was generated. This can safely be ignored if
-# this doesn't mean anything to you.
-CONF_VERSION = "1"
-
-# Set the root password to '0penBmc'
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
-  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
-  "
diff --git a/meta-intel/meta-s2600wf/conf/machine/s2600wf.conf b/meta-intel/meta-s2600wf/conf/machine/s2600wf.conf
deleted file mode 100644
index d0ca8a3..0000000
--- a/meta-intel/meta-s2600wf/conf/machine/s2600wf.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-intel-s2600wf.dtb"
-
-require conf/machine/include/ast2500.inc
-require conf/machine/include/obmc-bsp-common.inc
-require conf/machine/include/intel.inc
-
-UBOOT_MACHINE = "ast_g5_phy_config"
-
-FLASH_SIZE = "32768"
-
-VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
diff --git a/meta-intel/meta-s2600wf/recipes-phosphor/workbook/s2600wf-config.bb b/meta-intel/meta-s2600wf/recipes-phosphor/workbook/s2600wf-config.bb
deleted file mode 100644
index 3a92f9d..0000000
--- a/meta-intel/meta-s2600wf/recipes-phosphor/workbook/s2600wf-config.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SUMMARY = "s2600wf board wiring"
-DESCRIPTION = "Board wiring information for the s2600wf system."
-PR = "r1"
-
-inherit config-in-skeleton
diff --git a/meta-mellanox/conf/layer.conf b/meta-mellanox/conf/layer.conf
deleted file mode 100644
index 9b1c6b9..0000000
--- a/meta-mellanox/conf/layer.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-BBFILE_COLLECTIONS += "mellanox"
-BBFILE_PATTERN_mellanox = ""
diff --git a/meta-mellanox/meta-msn/conf/bblayers.conf.sample b/meta-mellanox/meta-msn/conf/bblayers.conf.sample
deleted file mode 100644
index 95b3b58..0000000
--- a/meta-mellanox/meta-msn/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,35 +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##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-x86 \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn \
-  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-x86 \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn \
-  "
diff --git a/meta-mellanox/meta-msn/conf/conf-notes.txt b/meta-mellanox/meta-msn/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a..0000000
--- a/meta-mellanox/meta-msn/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-mellanox/meta-msn/conf/layer.conf b/meta-mellanox/meta-msn/conf/layer.conf
deleted file mode 100644
index a571169..0000000
--- a/meta-mellanox/meta-msn/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 += "msn"
-BBFILE_PATTERN_msn = ""
diff --git a/meta-mellanox/meta-msn/conf/local.conf.sample b/meta-mellanox/meta-msn/conf/local.conf.sample
deleted file mode 100644
index 2547907..0000000
--- a/meta-mellanox/meta-msn/conf/local.conf.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-MACHINE ??= "msn"
-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"
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
-  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
-  "
diff --git a/meta-mellanox/meta-msn/conf/machine/msn.conf b/meta-mellanox/meta-msn/conf/machine/msn.conf
deleted file mode 100644
index af2229e..0000000
--- a/meta-mellanox/meta-msn/conf/machine/msn.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-mellanox-${MACHINE}.dtb"
-
-UBOOT_MACHINE = "ast_g5_ncsi_config"
-
-FLASH_SIZE = "32768"
-
-require conf/machine/include/ast2500.inc
-require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid.bb b/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid.bb
deleted file mode 100644
index 0236c24..0000000
--- a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-PV = "git${SRCPV}"
-
-MLX_IPMID_BRANCH = "openbmc"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI = "git://github.com/mellanoxbmc/ipmi.git;protocol=git;branch=${MLX_IPMID_BRANCH};"
-SRC_URI += "file://mlx_ipmid.service"
-SRC_URI += "file://remove_libdir.patch"
-
-SRCREV = "${AUTOREV}"
-
-require mlx-ipmid.inc
diff --git a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid.inc b/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid.inc
deleted file mode 100644
index 73e7614..0000000
--- a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-DESCRIPTION = "This is the OpenIPMI library, a library that makes simplifies building complex IPMI management software."
-SECTION = "console/network"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = " \
-    openssl \
-    popt \
-    zlib \
-    ncurses \
-    glib-2.0 \
-    gdbm \
-    dbus \
-    dbus-glib \
-"
-RDEPENDS_${PN} += " bash dbus"
-
-INC_PR = "r2"
-
-inherit autotools gettext update-alternatives systemd pkgconfig
-
-PACKAGECONFIG ??= "net-snmp"
-
-PACKAGECONFIG[net-snmp] = ",--with-ucdsnmp=no,net-snmp"
-PACKAGECONFIG[python] = "--with-python,--without-python,python,"
-PACKAGECONFIG[perl] = "--with-perl=${STAGING_BINDIR_NATIVE},--with-perl=no,perl,"
-PACKAGECONFIG[tcl] = "--with-tcl,--without-tcl,tcl,"
-
-EXTRA_OECONF = "\
-    --prefix=${prefix} \
-    --with-mellanox \
-    --with-dbus \
-    "
-
-S = "${WORKDIR}/git"
-
-PARALLEL_MAKEINST = ""
-
-SYSTEMD_PACKAGES = "${PN}"
-
-SYSTEMD_SERVICE_${PN} = " mlx_ipmid.service"
-
-
-do_install_append() {
-    install -d ${D}/etc/init.d
-    install -d ${D}/${systemd_unitdir}/system
-    install -m 644 ${WORKDIR}/mlx_ipmid.service ${D}/${systemd_unitdir}/system/mlx_ipmid.service
-    install -d ${D}${libdir}/mlx_ipmid
-    install -m 0644 ${B}/lanserv/mellanox/.libs/mellanox.so ${D}${libdir}/mlx_ipmid/
-    install -Dpm 644 ${D}/var/mlx_ipmid/mellanox/50-mlx-events-4.10.rules ${D}/lib/udev/rules.d/50-mlx-events.rules
-    install -Dpm 644 ${D}/var/mlx_ipmid/mellanox/50-mlx-hwmon-4-10-events.rules ${D}/lib/udev/rules.d/50-mlx-hwmon-events.rules
-}
-
-FILES_${PN} += "/usr/lib/perl5 \
-		/usr/lib/mlx_ipmid \
-                ${systemd_unitdir} \
-                "
-
-FILES_${PN}-dev += "/usr/lib/OpenIPMI"
-
-FILES_${PN}-dbg += "/usr/lib/perl5/auto/OpenIPMI/.debug"
diff --git a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid/mlx_ipmid.service b/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid/mlx_ipmid.service
deleted file mode 100644
index 09abe1e..0000000
--- a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid/mlx_ipmid.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=mlx_ipmid
-
-[Service]
-Restart=always
-OOMScoreAdjust=-1000
-
-ExecStart=/usr/bin/mlx_ipmid -n
-TimeoutSec=120
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid/remove_libdir.patch b/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid/remove_libdir.patch
deleted file mode 100644
index e74e06f..0000000
--- a/meta-mellanox/meta-msn/recipes-connectivity/mlx-ipmid/mlx-ipmid/remove_libdir.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
-index e80090d..b59ff24 100644
---- a/cmdlang/Makefile.am
-+++ b/cmdlang/Makefile.am
-@@ -16,7 +16,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \
- 	$(top_builddir)/utils/libOpenIPMIutils.la \
- 	$(top_builddir)/lib/libOpenIPMI.la
- libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-Wl,-Map -Wl,libOpenIPMIcmdlang.map -L$(libdir)
-+	-Wl,-Map -Wl,libOpenIPMIcmdlang.map
- 
- bin_PROGRAMS = openipmish
- 
-diff --git a/glib/Makefile.am b/glib/Makefile.am
-index 671cae2..eff55f3 100644
---- a/glib/Makefile.am
-+++ b/glib/Makefile.am
-@@ -11,14 +11,14 @@ libOpenIPMIglib_la_SOURCES = glib_os_hnd.c
- libOpenIPMIglib_la_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS)
- libOpenIPMIglib_la_LIBADD = $(GDBM_LIB)
- libOpenIPMIglib_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-Wl,-Map -Wl,libOpenIPMIglib.map $(GLIB_LIBS) -L$(libdir) \
-+	-Wl,-Map -Wl,libOpenIPMIglib.map $(GLIB_LIBS) \
- 	-rpath $(libdir)
- 
- libOpenIPMIglib12_la_SOURCES = glib_os_hnd.c
- libOpenIPMIglib12_la_CFLAGS = $(GLIB12_CFLAGS) $(AM_CFLAGS)
- libOpenIPMIglib12_la_LIBADD = $(GDBM_LIB)
- libOpenIPMIglib12_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-Wl,-Map -Wl,libOpenIPMIglib12.map $(GLIB12_LIBS) -L$(libdir) \
-+	-Wl,-Map -Wl,libOpenIPMIglib12.map $(GLIB12_LIBS) \
- 	-rpath $(libdir)
- 
- CLEANFILES = libOpenIPMIglib.map libOpenIPMIglib12.map
-diff --git a/tcl/Makefile.am b/tcl/Makefile.am
-index e2a98dc..256af0c 100644
---- a/tcl/Makefile.am
-+++ b/tcl/Makefile.am
-@@ -11,7 +11,7 @@ libOpenIPMItcl_la_SOURCES = tcl_os_hnd.c
- libOpenIPMItcl_la_CFLAGS = $(TCL_CFLAGS) $(AM_CFLAGS)
- libOpenIPMItcl_la_LIBADD = $(GDBM_LIB)
- libOpenIPMItcl_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-Wl,-Map -Wl,libOpenIPMItcl.map $(TCL_LIBS) -L$(libdir) \
-+	-Wl,-Map -Wl,libOpenIPMItcl.map $(TCL_LIBS) \
- 	-rpath $(libdir)
- 
- noinst_PROGRAMS = test_handlers
-diff --git a/unix/Makefile.am b/unix/Makefile.am
-index ac5b9f4..d5d4b82 100644
---- a/unix/Makefile.am
-+++ b/unix/Makefile.am
-@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c
- libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \
- 	$(top_builddir)/utils/libOpenIPMIutils.la
- libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-Wl,-Map -Wl,libOpenIPMIpthread.map -L$(libdir)
-+	-Wl,-Map -Wl,libOpenIPMIpthread.map
- 
- libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c
- libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
- 	$(GDBM_LIB)
- libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-Wl,-Map -Wl,libOpenIPMIposix.map -L$(libdir)
-+	-Wl,-Map -Wl,libOpenIPMIposix.map
- 
- noinst_HEADERS = heap.h
- 
diff --git a/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed/msn.cfg b/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed/msn.cfg
deleted file mode 100644
index e0df616..0000000
--- a/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed/msn.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLXSW_CORE=y
-CONFIG_MLXSW_CORE_HWMON=y
-CONFIG_MLXSW_CORE_THERMAL=y
-CONFIG_MLXSW_I2C=y
-CONFIG_MLXSW_MINIMAL=y
-CONFIG_OF_UNITTEST=y
-CONFIG_OF_DYNAMIC=y
-CONFIG_MFD_MLXREG_CORE=y
-CONFIG_MFD_MLXREG_I2C=y
-CONFIG_LEDS_MLXREG=y
-CONFIG_MLXREG_HOTPLUG=y
-CONFIG_SENSORS_TPS53679=y
-CONFIG_SENSORS_TMP102=y
-CONFIG_SENSORS_MAX6621=y
-CONFIG_THERMAL=y
-CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_OF=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_FSI=n
diff --git a/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed_%.bbappend
deleted file mode 100644
index 35e9d9b..0000000
--- a/meta-mellanox/meta-msn/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://msn.cfg"
\ No newline at end of file
diff --git a/meta-mellanox/meta-msn/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-mellanox/meta-msn/recipes-phosphor/images/obmc-phosphor-image.bbappend
deleted file mode 100644
index fb6a244..0000000
--- a/meta-mellanox/meta-msn/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " mlx-ipmid"
diff --git a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/failsafe-boot.sh b/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/failsafe-boot.sh
deleted file mode 100644
index ea1bd07..0000000
--- a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/failsafe-boot.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-echo "----------------
-System entered recovery mode. Running from backup flash!!!
-help for get ip:
-ifconfig eth0 $IP netmask $NETMASK up;
-route add default gw $GATEWAY eth0
-Or type udhcpc to get ip over dhcp.
-Please scp image file to /tmp folder and re-burn main flash with:
-/run/initramfs/recovery /tmp/<bmc-image-file>.
-----------------";
-
-mkdir /run/lock;
-
-mkdir /dev/mtd;
-
-ln -s /run/mtd\:u-boot-env /dev/mtd/u-boot-env;
-
-/usr/bin/mlx-hw-events.sh add reset /sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a140.i2c-bus/i2c-4/4-0071/mlxreg-core.1137/hwmon/hwmon*;
-
-mount /dev/mtdblock5 /run/initramfs/rw -t jffs2 -o remount,ro;
-mount tmpfs tmp -t tmpfs -o mode=755,nodev;
-
-export PS1="(recovery)\u@BMC:\w\$"
-
-while true;
-do
-    /run/initramfs/ro/sbin/sulogin;
-done
-
diff --git a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/obmc-init.sh b/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/obmc-init.sh
deleted file mode 100644
index 55862aa..0000000
--- a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/obmc-init.sh
+++ /dev/null
@@ -1,430 +0,0 @@
-#!/bin/sh
-
-fslist="proc sys dev run"
-rodir=run/initramfs/ro
-rwdir=run/initramfs/rw
-upper=$rwdir/cow
-work=$rwdir/work
-
-cd /
-mkdir -p $fslist
-mount dev dev -tdevtmpfs
-mount sys sys -tsysfs
-mount proc proc -tproc
-if ! grep run proc/mounts
-then
-	mount tmpfs run -t tmpfs -o mode=755,nodev
-fi
-
-mkdir -p $rodir $rwdir
-
-cp -rp init failsafe recovery shutdown update update_all whitelist bin sbin usr lib etc var run/initramfs
-
-# To start a interactive shell with job control at this point, run
-# getty 38400 ttyS4
-
-findmtd() {
-	m=$(grep -xl "$1" /sys/class/mtd/*/name)
-	m=${m%/name}
-	m=${m##*/}
-	echo $m
-}
-
-blkid_fs_type() {
-	# Emulate util-linux's `blkid -s TYPE -o value $1`
-	# Example busybox blkid output:
-	#    # blkid /dev/mtdblock5
-	#    /dev/mtdblock5: TYPE="squashfs"
-	# Process output to extract TYPE value "squashfs".
-	blkid $1 | sed -e 's/^.*TYPE="//' -e 's/".*$//'
-}
-
-probe_fs_type() {
-	fst=$(blkid_fs_type $1)
-	echo ${fst:=jffs2}
-}
-
-# This fw_get_env_var is a possibly broken version of fw_printenv that
-# does not check the crc or flag byte.
-# The u-boot environemnt starts with a crc32, followed by a flag byte
-# when a redundannt environment is configured, followed by var=value\0 sets.
-# The flag byte for nand is a 1 byte counter; for nor it is a 1 or 0 byte.
-
-get_fw_env_var() {
-	# do we have 1 or 2 copies of the environment?
-	# count non-blank non-comment lines
-	# copies=$(grep -v ^# /etc/fw_env.config | grep -c [::alnum::])
-	# ... we could if we had the fw_env.config in the initramfs
-	copies=2
-
-	# * Change \n to \r and \0 to \n
-	# * Skip to the 5th byte to skip over crc
-	# * then skip to the first or 2nd byte to skip over flag if it exists
-	# * stop parsing at first empty line corresponding to the
-	#   double \0 at the end of the environment.
-	# * print the value of the variable name passed as argument
-
-	envdev=$(findmtd u-boot-env)
-	if test -n $envdev
-	then
-		cat /dev/$envdev |
-		tr '\n\000' '\r\n' |
-		tail -c +5 | tail -c +${copies-1} |
-		sed -ne '/^$/,$d' -e "s/^$1=//p"
-	fi
-}
-
-setup_resolv() {
-	runresolv=/run/systemd/resolve/resolv.conf
-	etcresolv=/etc/resolv.conf
-
-	if test ! -e $etcresolv -a ! -L $etcresolv
-	then
-		mkdir -p ${runresolv%/*}
-		ln -s $runresolv $etcresolv
-	fi
-	if test ! -f $runresolv
-	then
-		cat  /proc/net/pnp > $runresolv
-	fi
-
-	return 0
-}
-
-try_tftp() {
-	# split into  tftp:// host:port/ path/on/remote
-	# then spilt off / and then :port from the end of host:port/
-	# and : from the beginning of port
-
-	rest="${1#tftp://}"
-	path=${rest#*/}
-	host=${rest%$path}
-	host="${host%/}"
-	port="${host#${host%:*}}"
-	host="${host%$port}"
-	port="${port#:}"
-
-	setup_resolv
-
-	if test -z "$host" -o -z "$path"
-	then
-		debug_takeover "Invalid tftp download url '$url'."
-	elif echo "Downloading '$url' from $host ..."  &&
-		! tftp -g -r "$path" -l /run/image-rofs "$host" ${port+"$port"}
-	then
-		debug_takeover "Download of '$url' failed."
-	fi
-}
-
-try_wget() {
-	setup_resolv
-
-	echo "Downloading '$1' ..."
-	if ! wget -O /run/image-rofs "$1"
-	then
-		debug_takeover "Download of '$url' failed."
-	fi
-}
-
-debug_takeover() {
-	echo "$@"
-	test -n "$@" && echo Enter password to try to manually fix.
-	cat << HERE
-After fixing run exit to continue this script, or reboot -f to retry, or
-touch /takeover and exit to become PID 1 allowing editing of this script.
-HERE
-
-	while ! sulogin && ! test -f /takeover
-	do
-		echo getty failed, retrying
-	done
-
-	# Touch /takeover in the above getty to become pid 1
-	if test -e /takeover
-	then
-		cat << HERE
-
-Takeover of init requested.  Executing /bin/sh as PID 1.
-When finished exec new init or cleanup and run reboot -f.
-
-Warning: No job control!  Shell exit will panic the system!
-HERE
-		export PS1=init#\ 
-		exec /bin/sh
-	fi
-}
-
-env=$(findmtd u-boot-env)
-if test -n $env
-then
-	ln -s /dev/$env /run/mtd:u-boot-env
-	cp /run/mtd:u-boot-env /run/fw_env
-fi
-
-rofs=$(findmtd rofs)
-rwfs=$(findmtd rwfs)
-
-rodev=/dev/mtdblock${rofs#mtd}
-rwdev=/dev/mtdblock${rwfs#mtd}
-
-# Set to y for yes, anything else for no.
-force_rwfst_jffs2=y
-flash_images_before_init=n
-consider_download_files=y
-consider_download_tftp=y
-consider_download_http=y
-consider_download_ftp=y
-
-rofst=squashfs
-rwfst=$(probe_fs_type $rwdev)
-roopts=ro
-rwopts=rw
-
-image=/run/initramfs/image-
-trigger=${image}rwfs
-
-init=/sbin/init
-failsafe=/run/initramfs/failsafe
-fsckbase=/sbin/fsck.
-fsck=$fsckbase$rwfst
-fsckopts=-a
-optfile=/run/initramfs/init-options
-optbase=/run/initramfs/init-options-base
-urlfile=/run/initramfs/init-download-url
-update=/run/initramfs/update
-
-if test -e /${optfile##*/}
-then
-	cp /${optfile##*/} $optfile
-fi
-
-if test -e /${optbase##*/}
-then
-	cp /${optbase##*/} $optbase
-else
-	touch $optbase
-fi
-
-if test ! -f $optfile
-then
-	cat /proc/cmdline $optbase > $optfile
-	get_fw_env_var openbmcinit >> $optfile
-	get_fw_env_var openbmconce >> $optfile
-fi
-
-echo rofs = $rofs $rofst   rwfs = $rwfs $rwfst
-
-if grep -w debug-init-sh $optfile
-then
-	debug_takeover "Debug initial shell requested by command line."
-fi
-
-if test "x$consider_download_files" = xy &&
-	grep -w openbmc-init-download-files $optfile
-then
-	if test -f ${urlfile##*/}
-	then
-		cp ${urlfile##*/} $urlfile
-	fi
-	if test ! -f $urlfile
-	then
-		get_fw_env_var openbmcinitdownloadurl > $urlfile
-	fi
-	url="$(cat $urlfile)"
-	rest="${url#*://}"
-	proto="${url%$rest}"
-
-	if test -z "$url"
-	then
-		echo "Download url empty.  Ignoring download request."
-	elif test -z "$proto"
-	then
-		echo "Download failed."
-	elif test "$proto" = tftp://
-	then
-		if test "x$consider_download_tftp" = xy
-		then
-			try_tftp "$url"
-		else
-			echo "Download failed."
-		fi
-	elif test "$proto" = http://
-	then
-		if test "x$consider_download_http" = xy
-		then
-			try_wget "$url"
-		else
-			echo "Download failed."
-		fi
-	elif test "$proto" = ftp://
-	then
-		if test "x$consider_download_ftp" = xy
-		then
-			try_wget "$url"
-		else
-			echo "Download failed."
-		fi
-	else
-		echo "Download failed."
-	fi
-fi
-
-# If there are images in root move them to /run/initramfs/ or /run/ now.
-imagebasename=${image##*/}
-if test -n "${imagebasename}" && ls /${imagebasename}* > /dev/null 2>&1
-then
-	if test "x$flash_images_before_init" = xy
-	then
-		echo "Flash images found, will update before starting init."
-		mv /${imagebasename}* ${image%$imagebasename}
-	else
-		echo "Flash images found, will use but deferring flash update."
-		mv /${imagebasename}* /run/
-	fi
-fi
-
-if grep -w clean-rwfs-filesystem $optfile
-then
-	echo "Cleaning of read-write overlay filesystem requested."
-	touch $trigger
-fi
-
-if test "x$force_rwfst_jffs2" = xy -a $rwfst != jffs2 -a ! -f $trigger
-then
-	echo "Converting read-write overlay filesystem to jffs2 forced."
-	touch $trigger
-fi
-
-if ls $image* > /dev/null 2>&1
-then
-	if ! test -x $update
-	then
-		debug_takeover "Flash update requested but $update missing!"
-	elif test -f $trigger -a ! -s $trigger
-	then
-		echo "Saving selected files from read-write overlay filesystem."
-		$update --no-restore-files
-		echo "Clearing read-write overlay filesystem."
-		flash_eraseall /dev/$rwfs
-		echo "Restoring saved files to read-write overlay filesystem."
-		touch $trigger
-		$update --no-save-files --clean-saved-files
-	else
-		$update --clean-saved-files
-	fi
-
-	rwfst=$(probe_fs_type $rwdev)
-	fsck=$fsckbase$rwfst
-fi
-
-if grep -w overlay-filesystem-in-ram $optfile
-then
-	rwfst=none
-fi
-
-copyfiles=
-if grep -w copy-files-to-ram $optfile
-then
-	rwfst=none
-	copyfiles=y
-fi
-
-# It would be nice to do this after fsck but that mean rofs is mounted
-# which triggers the mtd is mounted check
-if test "$rwfst$copyfiles" = noney
-then
-	touch $trigger
-	$update --copy-files --clean-saved-files --no-restore-files
-fi
-
-if grep -w copy-base-filesystem-to-ram $optfile &&
-	test ! -e /run/image-rofs && ! cp $rodev /run/image-rofs
-then
-	# Remove any partial copy to avoid attempted usage later
-	if test -e  /run/image-rofs
-	then
-		ls -l /run/image-rofs
-		rm -f /run/image-rofs
-	fi
-	debug_takeover "Copying $rodev to /run/image-rofs failed."
-fi
-
-if test -s /run/image-rofs
-then
-	rodev=/run/image-rofs
-	roopts=$roopts,loop
-fi
-
-mount $rodev $rodir -t $rofst -o $roopts
-
-if test -x $rodir$fsck
-then
-	for fs in $fslist
-	do
-		mount --bind $fs $rodir/$fs
-	done
-	chroot $rodir $fsck $fsckopts $rwdev
-	rc=$?
-	for fs in $fslist
-	do
-		umount $rodir/$fs
-	done
-	if test $rc -gt 1
-	then
-		debug_takeover "fsck of read-write fs on $rwdev failed (rc=$rc)"
-	fi
-elif test "$rwfst" != jffs2 -a "$rwfst" != none
-then
-	echo "No '$fsck' in read only fs, skipping fsck."
-fi
-
-if test "$rwfst" = none
-then
-	echo "Running with read-write overlay in RAM for this boot."
-	echo "No state will be preserved unless flash update performed."
-elif ! mount $rwdev $rwdir -t $rwfst -o $rwopts
-then
-	msg="$(cat)" << HERE
-
-Mounting read-write $rwdev filesystem failed.  Please fix and run
-	mount $rwdev $rwdir -t $rwfst -o $rwopts
-to to continue, or do change nothing to run from RAM for this boot.
-HERE
-	debug_takeover "$msg"
-fi
-
-rm -rf $work
-mkdir -p $upper $work
-
-mount -t overlay -o lowerdir=$rodir,upperdir=$upper,workdir=$work cow /root
-
-while ! chroot /root /bin/sh -c "test -x '$init' -a -s '$init'"
-do
-	msg="$(cat)" << HERE
-
-Unable to confirm /sbin/init is an executable non-empty file
-in merged file system mounted at /root.
-
-Change Root test failed!  Invoking emergency shell.
-HERE
-	debug_takeover "$msg"
-done
-
-for f in $fslist
-do
-	mount --move $f root/$f
-done
-
-# switch_root /root $init
-ln -s /root/dev/mem /dev/mem
-FLASH_CP=`/root/sbin/devmem 0x1e785030`
-FLASH_CP=$(($FLASH_CP&0x02))
-rm /dev/mem
-
-if [ $FLASH_CP == 0 ]; then
-#	echo "Flash 1 used. Normal boot.";
-    exec chroot /root $init;
-else
-    exec chroot /root $failsafe;
-fi
-
diff --git a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/obmc-update_all.sh b/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/obmc-update_all.sh
deleted file mode 100644
index fbcf466..0000000
--- a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/obmc-update_all.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# Script to burn entire 32MB of BMC SPI Flash
-#
-# Usage:
-#    a) Local: /run/initramfs/update_all <bmc-image-file>
-#    b) Remote: sshpass -p "<root-password>" ssh root@<ip> '/run/initramfs/update_all <bmc-image-file>'
-#
-# Assumptions:
-#    <bmc-image-file> is a 32MB file representing all partitions in BMC SPI Flash
-#    <bmc-image-file> exists on local filesystem
-#    /dev/mtd0 represents entire BMC SPI Flash device
-#    /dev/mtd5 is a JFFS2 filesystem (rwfs) partition
-#    /bsp/reset/bmc_upgrade is symlink pointing to proper sticky bit in CPLD
-#
-
-if [ -f $1 ]
-then
-   echo $0: Update BMC SPI Flash with $1
-else
-   echo $0: File $1 not found on target, exiting
-   exit
-fi
-
-echo $0: Stopping system services
-systemctl stop mlx_ipmid
-
-echo $0: Remounting rwfs "(/dev/mtd5)" as read-only
-mount /dev/mtdblock5 /run/initramfs/rw -t jffs2 -o remount,ro
-
-echo $0: Unmounting rofs "(/dev/mtd4)"
-umount /dev/mtdblock4
-
-MAC=`fw_printenv ethaddr | sed -n "s/^ethaddr=//p"`
-
-echo $0: Burning SPI Flash "(/dev/mtd0)" with image "$1"
-/usr/sbin/flashcp -v $1 /dev/mtd0
-
-if [ -v $MAC ]; then
-	echo "MAC env variable not exist. Set eth0 MAC from eeprom."
-	MAC=`hexdump -n 6 -s 0xf0 -v -e '/1 "%02x:"' /sys/bus/i2c/devices/6-0055/eeprom`;MAC=${MAC::-1};
-else
-	echo "MAC env variable exist. Set eth0 MAC from env."
-fi;
-fw_setenv ethaddr $MAC
-
-echo $0: Setting bmc_upgrade sticky bit in CPLD
-echo 1 > /bsp/reset/bmc_upgrade
-
-echo $0: Rebooting BMC
-echo 0 > /bsp/reset/bmc_reset_soft
-
-
-
diff --git a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/recovery.sh b/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/recovery.sh
deleted file mode 100644
index 256e18f..0000000
--- a/meta-mellanox/meta-msn/recipes-phosphor/initfs/files/recovery.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-
-#!/bin/sh
-#
-# Script to burn entire 32MB of BMC SPI Flash 1
-#
-# Usage:
-#    a) Local: /run/initramfs/recovery <bmc-image-file>
-#
-# Assumptions:
-#    <bmc-image-file> is a 32MB file representing all partitions in BMC SPI Flash
-#    <bmc-image-file> exists on local filesystem
-#    /dev/mtd0 represents entire BMC SPI Flash device
-#    /dev/mtd5 is a JFFS2 filesystem (rwfs) partition
-#    /bsp/reset/bmc_upgrade is symlink pointing to proper sticky bit in CPLD
-#
-
-if [ -f $1 ]
-then
-   echo $0: Update BMC SPI Flash with $1
-else
-   echo $0: File $1 not found on target, exiting
-   exit
-fi
-
-echo $0: Remounting rwfs "(/dev/mtd5)" as read-only
-mount /dev/mtdblock5 /run/initramfs/rw -t jffs2 -o remount,ro
-
-echo $0: Unmounting rofs "(/dev/mtd4)"
-umount /dev/mtdblock4
-
-devmem 0x1e785034 l 0x01;
-
-MAC=`fw_printenv ethaddr | sed -n "s/^ethaddr=//p"`
-
-echo $0: Burning SPI Flash "(/dev/mtd0)" with image "$1"
-/usr/sbin/flashcp -v $1 /dev/mtd0
-
-if [ -v $MAC ]; then
-	echo "MAC env variable not exist. Set eth0 MAC from eeprom."
-	MAC=`hexdump -n 6 -s 0xf0 -v -e '/1 "%02x:"' /sys/bus/i2c/devices/6-0055/eeprom`;MAC=${MAC::-1};
-else
-	echo "MAC env variable exist. Set eth0 MAC from env."
-fi;
-
-fw_setenv ethaddr $MAC
-
-echo $0: Setting bmc_upgrade sticky bit in CPLD
-echo 1 > /bsp/reset/bmc_upgrade
-
-echo $0: Rebooting BMC
-echo 0 > /bsp/reset/bmc_reset_soft
-
diff --git a/meta-mellanox/meta-msn/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend b/meta-mellanox/meta-msn/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend
deleted file mode 100644
index 9ad6bc8..0000000
--- a/meta-mellanox/meta-msn/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://obmc-init.sh"
-SRC_URI += "file://obmc-update_all.sh"
-SRC_URI += "file://failsafe-boot.sh"
-SRC_URI += "file://recovery.sh"
-
-
-do_install_append() {
-        install -m 0755 ${WORKDIR}/obmc-init.sh ${D}/init
-        install -m 0755 ${WORKDIR}/failsafe-boot.sh ${D}/failsafe
-        install -m 0755 ${WORKDIR}/obmc-update_all.sh ${D}/update_all
-        install -m 0755 ${WORKDIR}/recovery.sh ${D}/recovery
-}
-
-FILES_${PN} += " /update_all /failsafe /recovery"
diff --git a/meta-mellanox/meta-msn/recipes.txt b/meta-mellanox/meta-msn/recipes.txt
deleted file mode 100644
index c583668..0000000
--- a/meta-mellanox/meta-msn/recipes.txt
+++ /dev/null
@@ -1 +0,0 @@
-recipes-phosphor     - Phosphor OpenBMC applications and configuration
diff --git a/meta-portwell/meta-neptune/conf/bblayers.conf.sample b/meta-portwell/meta-neptune/conf/bblayers.conf.sample
deleted file mode 100644
index 90488aa..0000000
--- a/meta-portwell/meta-neptune/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,19 +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##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune \
-  "
diff --git a/meta-portwell/meta-neptune/conf/conf-notes.txt b/meta-portwell/meta-neptune/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a..0000000
--- a/meta-portwell/meta-neptune/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-portwell/meta-neptune/conf/layer.conf b/meta-portwell/meta-neptune/conf/layer.conf
deleted file mode 100644
index 5e44606..0000000
--- a/meta-portwell/meta-neptune/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 += "neptune"
-BBFILE_PATTERN_neptune = ""
diff --git a/meta-portwell/meta-neptune/conf/local.conf.sample b/meta-portwell/meta-neptune/conf/local.conf.sample
deleted file mode 100644
index 58e9cf5..0000000
--- a/meta-portwell/meta-neptune/conf/local.conf.sample
+++ /dev/null
@@ -1,223 +0,0 @@
-#
-# This file is your local configuration file and is where all local user settings
-# are placed. The comments in this file give some guide to the options a new user
-# to the system might want to change but pretty much any configuration option can
-# be set in this file.
-#
-# Lines starting with the '#' character are commented out and in some cases the
-# default values are provided as comments to show people example syntax. Enabling
-# the option is a question of removing the # character and making any change to the
-# variable as required.
-
-#
-# Machine Selection
-#
-MACHINE ??= "neptune"
-
-#
-# Where to place downloads
-#
-# During a first build the system will download many different source code tarballs
-# from various upstream projects. This can take a while, particularly if your network
-# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
-# can preserve this directory to speed up this part of subsequent builds. This directory
-# is safe to share between multiple builds on the same machine too.
-#
-# The default is a downloads directory under TOPDIR which is the build directory.
-#
-#DL_DIR ?= "${TOPDIR}/downloads"
-
-#
-# Where to place shared-state files
-#
-# BitBake has the capability to accelerate builds based on previously built output.
-# This is done using "shared state" files which can be thought of as cache objects
-# and this option determines where those files are placed.
-#
-# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
-# from these files if no changes were made to the configuration. If changes were made
-# to the configuration, only shared state files where the state was still valid would
-# be used (done using checksums).
-#
-# The default is a sstate-cache directory under TOPDIR.
-#
-#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
-
-#
-# Where to place the build output
-#
-# This option specifies where the bulk of the building work should be done and
-# where BitBake should place its temporary files and output. Keep in mind that
-# this includes the extraction and compilation of many applications and the toolchain
-# which can use Gigabytes of hard disk space.
-#
-# The default is a tmp directory under TOPDIR.
-#
-#TMPDIR = "${TOPDIR}/tmp"
-
-#
-# Default policy config
-#
-# The distribution setting controls which policy settings are used as defaults.
-# The default value is fine for general Yocto project use, at least initially.
-# Ultimately when creating custom policy, people will likely end up subclassing
-# these defaults.
-#
-DISTRO ?= "openbmc-phosphor"
-# As an example of a subclass there is a "bleeding" edge policy configuration
-# where many versions are set to the absolute latest code from the upstream 
-# source control systems. This is just mentioned here as an example, its not
-# useful to most new users.
-# DISTRO ?= "poky-bleeding"
-
-#
-# Package Management configuration
-#
-# This variable lists which packaging formats to enable. Multiple package backends
-# can be enabled at once and the first item listed in the variable will be used
-# to generate the root filesystems.
-# Options are:
-#  - 'package_deb' for debian style deb files
-#  - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
-#  - 'package_rpm' for rpm style packages
-# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
-# We default to rpm:
-PACKAGE_CLASSES ?= "package_rpm"
-
-#
-# SDK/ADT target architecture
-#
-# This variable specifies the architecture to build SDK/ADT items for and means
-# you can build the SDK packages for architectures other than the machine you are
-# running the build on (i.e. building i686 packages on an x86_64 host).
-# Supported values are i686 and x86_64
-#SDKMACHINE ?= "i686"
-
-SANITY_TESTED_DISTROS_append ?= " *"
-
-#
-# Extra image configuration defaults
-#
-# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated
-# images. Some of these options are added to certain image types automatically. The
-# variable can contain the following options:
-#  "dbg-pkgs"       - add -dbg packages for all installed packages
-#                     (adds symbol information for debugging/profiling)
-#  "dev-pkgs"       - add -dev packages for all installed packages
-#                     (useful if you want to develop against libs in the image)
-#  "ptest-pkgs"     - add -ptest packages for all ptest-enabled packages
-#                     (useful if you want to run the package test suites)
-#  "tools-sdk"      - add development tools (gcc, make, pkgconfig etc.)
-#  "tools-debug"    - add debugging tools (gdb, strace)
-#  "eclipse-debug"  - add Eclipse remote debugging support
-#  "tools-profile"  - add profiling tools (oprofile, exmap, lttng, valgrind)
-#  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
-#  "debug-tweaks"   - make an image suitable for development
-#                     e.g. ssh root access has a blank password
-# There are other application targets that can be used here too, see
-# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
-# We default to enabling the debugging tweaks.
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-
-#
-# Additional image features
-#
-# The following is a list of additional classes to use when building images which
-# enable extra features. Some available options which can be included in this variable
-# are:
-#   - 'buildstats' collect build statistics
-#   - 'image-mklibs' to reduce shared library files size for an image
-#   - 'image-prelink' in order to prelink the filesystem image
-#   - 'image-swab' to perform host system intrusion detection
-# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
-# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-
-#
-# Runtime testing of images
-#
-# The build system can test booting virtual machine images under qemu (an emulator)
-# after any root filesystems are created and run tests against those images. To
-# enable this uncomment this line. See classes/testimage(-auto).bbclass for
-# further details.
-#TEST_IMAGE = "1"
-#
-# Interactive shell configuration
-#
-# Under certain circumstances the system may need input from you and to do this it
-# can launch an interactive shell. It needs to do this since the build is
-# multithreaded and needs to be able to handle the case where more than one parallel
-# process may require the user's attention. The default is iterate over the available
-# terminal types to find one that works.
-#
-# Examples of the occasions this may happen are when resolving patches which cannot
-# be applied, to use the devshell or the kernel menuconfig
-#
-# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
-# Note: currently, Konsole support only works for KDE 3.x due to the way
-# newer Konsole versions behave
-#OE_TERMINAL = "auto"
-# By default disable interactive patch resolution (tasks will just fail instead):
-PATCHRESOLVE = "noop"
-
-#
-# Disk Space Monitoring during the build
-#
-# Monitor the disk space during the build. If there is less that 1GB of space or less
-# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
-# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort
-# of the build. The reason for this is that running completely out of space can corrupt
-# files and damages the build in ways which may not be easily recoverable.
-# It's necessary to monitor /tmp, if there is no space left the build will fail
-# with very exotic errors.
-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"
-
-#
-# Shared-state files from other locations
-#
-# As mentioned above, shared state files are prebuilt cache data objects which can
-# used to accelerate build time. This variable can be used to configure the system
-# to search other mirror locations for these objects before it builds the data itself.
-#
-# This can be a filesystem directory, or a remote url such as http or ftp. These
-# would contain the sstate-cache results from previous builds (possibly from other
-# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the
-# cache locations to check for the shared objects.
-# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH
-# at the end as shown in the examples below. This will be substituted with the
-# correct path within the directory structure.
-#SSTATE_MIRRORS ?= "\
-#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
-#file://.* file:///some/local/dir/sstate/PATH"
-
-
-#
-# Qemu configuration
-#
-# By default qemu will build with a builtin VNC server where graphical output can be
-# seen. The two lines below enable the SDL backend too. This assumes there is a
-# libsdl library available on your build system.
-#PACKAGECONFIG_append_pn-qemu-native = " sdl"
-#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
-#ASSUME_PROVIDED += "libsdl-native"
-
-
-# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
-# track the version of this file when it was generated. This can safely be ignored if
-# this doesn't mean anything to you.
-CONF_VERSION = "1"
-
-# Set the root password to '0penBmc'
-INHERIT += "extrausers"
-
-EXTRA_USERS_PARAMS = " \
-  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
-  "
diff --git a/meta-portwell/meta-neptune/conf/machine/neptune.conf b/meta-portwell/meta-neptune/conf/machine/neptune.conf
deleted file mode 100644
index 007495a..0000000
--- a/meta-portwell/meta-neptune/conf/machine/neptune.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-portwell-${MACHINE}.dtb"
-
-UBOOT_MACHINE = "ast_g5_ncsi_config"
-
-require conf/machine/include/ast2500.inc
-require conf/machine/include/obmc-bsp-common.inc
-
-OBMC_MACHINE_FEATURES += "\
-        obmc-phosphor-fan-mgmt \
-        obmc-phosphor-chassis-mgmt \
-        obmc-phosphor-flash-mgmt \
-        obmc-host-ipmi \
-        obmc-host-ctl \
-        obmc-host-state-mgmt \
-        obmc-chassis-state-mgmt \
-        obmc-bmc-state-mgmt \
-        "
-FLASH_SIZE = "32768"
-VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
-
diff --git a/meta-portwell/meta-neptune/recipes-kernel/linux/linux-aspeed/neptune.cfg b/meta-portwell/meta-neptune/recipes-kernel/linux/linux-aspeed/neptune.cfg
deleted file mode 100644
index 9fc33b3..0000000
--- a/meta-portwell/meta-neptune/recipes-kernel/linux/linux-aspeed/neptune.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_SENSORS_TMP421=y
-CONFIG_SENSORS_MAX31785=y
-CONFIG_RTC_DRV_RV8803=y
-CONFIG_TCG_TPM=y
-CONFIG_TCG_TIS_I2C_INFINEON=y
diff --git a/meta-portwell/meta-neptune/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-portwell/meta-neptune/recipes-kernel/linux/linux-aspeed_%.bbappend
deleted file mode 100644
index 1420d15..0000000
--- a/meta-portwell/meta-neptune/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:"
-SRC_URI += "file://neptune.cfg"
diff --git a/meta-portwell/meta-neptune/recipes.txt b/meta-portwell/meta-neptune/recipes.txt
deleted file mode 100644
index 3ec3f4a..0000000
--- a/meta-portwell/meta-neptune/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
diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf
deleted file mode 100644
index 017e912..0000000
--- a/meta-quanta/conf/layer.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-BBFILE_COLLECTIONS += "quanta"
-BBFILE_PATTERN_quanta = ""
diff --git a/meta-quanta/meta-q71l/README.md b/meta-quanta/meta-q71l/README.md
deleted file mode 100644
index 01315ae..0000000
--- a/meta-quanta/meta-q71l/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Quanta-Q71l
-================
-
-This is the Quanta-Q71l machine layer.
-
-This platform is currently supported, although often behind.
diff --git a/meta-quanta/meta-q71l/conf/bblayers.conf.sample b/meta-quanta/meta-q71l/conf/bblayers.conf.sample
deleted file mode 100644
index 4fc6799..0000000
--- a/meta-quanta/meta-q71l/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,35 +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##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-x86 \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l \
-  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-x86 \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta \
-  ##OEROOT##/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l \
-  "
diff --git a/meta-quanta/meta-q71l/conf/conf-notes.txt b/meta-quanta/meta-q71l/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a..0000000
--- a/meta-quanta/meta-q71l/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf
deleted file mode 100644
index 80bae52..0000000
--- a/meta-quanta/meta-q71l/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 += "q71l"
-BBFILE_PATTERN_q71l = ""
diff --git a/meta-quanta/meta-q71l/conf/local.conf.sample b/meta-quanta/meta-q71l/conf/local.conf.sample
deleted file mode 100644
index 8862b5c..0000000
--- a/meta-quanta/meta-q71l/conf/local.conf.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-MACHINE ??= "quanta-q71l"
-DISTRO ?= "openbmc-phosphor"
-PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*"
-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-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
deleted file mode 100644
index b36a098..0000000
--- a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-${MACHINE}.dtb"
-
-require conf/machine/include/ast2400.inc
-require conf/machine/include/obmc-bsp-common.inc
-
-UBOOT_MACHINE_palmetto = "ast_g4_ncsi_config"
-UBOOT_ENTRYPOINT = "0x40008000"
-UBOOT_LOADADDRESS = "0x40008000"
-
-FLASH_SIZE = "32768"
-
-# If we included the openpower.inc we'd get these from that.
-#OBMC_MACHINE_FEATURES += "\
-#        obmc-phosphor-fan-mgmt \
-#        obmc-phosphor-chassis-mgmt \
-#        obmc-phosphor-flash-mgmt \
-#        obmc-host-ipmi \
-#        obmc-host-ctl \
-#        obmc-host-state-mgmt \
-#        obmc-chassis-state-mgmt \
-#        obmc-bmc-state-mgmt \
-#        "
-# But we don't, and it's ok :D  We're pulling in specific packages in an image recipe.
-
-# This sets up our own Quanta-q71l.py inclusion based on the Zaius.py in the skeleton repo.
-# As something temporarily required.
-VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
-PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"
-
-# These are meant to include the inventory config.yaml and so on.
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "q71l-ipmi-inventory-map-native"
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory = "q71l-ipmi-sensor-map-native"
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-channel-config = "q71l-ipmi-channel-config-native"
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-merge-config = "q71l-ipmi-fru-merge-config-native"
-
-
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-bt"
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/images/obmc-phosphor-image.bbappend
deleted file mode 100644
index 6124ab0..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-OBMC_IMAGE_EXTRA_INSTALL_append_quanta-q71l = " spictrl"
-OBMC_IMAGE_EXTRA_INSTALL_append_quanta-q71l = " quanta-powerctrl"
-
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend
deleted file mode 100644
index f509497..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend
+++ /dev/null
@@ -1,20 +0,0 @@
-inherit obmc-phosphor-systemd
-
-FILESEXTRAPATHS_prepend_quanta-q71l := "${THISDIR}/${PN}:"
-
-EEPROM_NAMES = "motherboard pdb fp bmc"
-
-EEPROMFMT = "system/chassis/{0}"
-EEPROM_ESCAPEDFMT = "system-chassis-{0}"
-EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}"
-EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}"
-
-ENVFMT = "obmc/eeproms/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_quanta-q71l := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
-
-TMPL = "obmc-read-eeprom@.service"
-TGT = "${SYSTEMD_DEFAULT_TARGET}"
-INSTFMT = "obmc-read-eeprom@{0}.service"
-FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}"
-
-SYSTEMD_LINK_${PN}_append_quanta-q71l := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/bmc b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/bmc
deleted file mode 100644
index 0404080..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/bmc
+++ /dev/null
@@ -1,2 +0,0 @@
-SYSFS_PATH=/sys/bus/i2c/devices/8-0050/eeprom
-FRUID=50
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/fp b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/fp
deleted file mode 100644
index 32e3ef7..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/fp
+++ /dev/null
@@ -1,2 +0,0 @@
-SYSFS_PATH=/sys/bus/i2c/devices/1-0057/eeprom
-FRUID=57
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard
deleted file mode 100644
index b01390a..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard
+++ /dev/null
@@ -1,2 +0,0 @@
-SYSFS_PATH=/sys/bus/i2c/devices/1-0054/eeprom
-FRUID=56
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/pdb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/pdb
deleted file mode 100644
index a083921..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/pdb
+++ /dev/null
@@ -1,2 +0,0 @@
-SYSFS_PATH=/sys/bus/i2c/devices/7-0052/eeprom
-FRUID=52
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb
deleted file mode 100644
index 6eae845..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Quanta Q71l IPMI Channel to if_name mapping."
-PR = "r1"
-
-inherit native
-inherit phosphor-ipmi-host
-inherit obmc-phosphor-license
-
-PROVIDES += "virtual/phosphor-ipmi-channel-config"
-
-SRC_URI += "file://channel.yaml"
-
-S = "${WORKDIR}"
-
-do_install() {
-	DEST=${D}${sensor_datadir}
-        install -d ${DEST}
-	install channel.yaml ${DEST}/channel.yaml
-}
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config/channel.yaml b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config/channel.yaml
deleted file mode 100644
index 3cc2cd2..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config/channel.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-1:
-  ifName: eth0
-2:
-  ifName: eth1
-
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb
deleted file mode 100644
index 330cda1..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-inherit native
-inherit obmc-phosphor-license
-
-DEPENDS += "virtual/phosphor-ipmi-fru-inventory"
-PROVIDES += "virtual/phosphor-ipmi-fru-merge-config"
-
-# Put the fru_config in the right place with the right name.
-# Pull the IPMI FRU YAML config to use it in the IPMI HOST YAML.
-do_install_append() {
-  IPMI_FRU_SRC=${datadir}/phosphor-ipmi-fru/config
-  IPMI_HOST_DEST=${D}${datadir}/phosphor-ipmi-host/config
-  install -d ${IPMI_HOST_DEST}
-  cat ${IPMI_FRU_SRC}/config.yaml > ${IPMI_HOST_DEST}/fru_config.yaml
-}
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map-native.bb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map-native.bb
deleted file mode 100644
index 93706f3..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map-native.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Quanta-Q71l IPMI to DBus Inventory mapping."
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-inherit phosphor-ipmi-fru
-
-SRC_URI += "file://config.yaml"
-
-PROVIDES += "virtual/phosphor-ipmi-fru-inventory"
-
-S = "${WORKDIR}"
-
-do_install() {
-        DEST=${D}${config_datadir}
-
-        install -d ${DEST}
-        install config.yaml ${DEST}
-}
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map/config.yaml b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map/config.yaml
deleted file mode 100644
index 8729521..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map/config.yaml
+++ /dev/null
@@ -1,202 +0,0 @@
-0x56:
-  /system/chassis/motherboard:
-    entityID: 7
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-  /system:
-    entityID: 23
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Chassis
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Chassis
-        Model:
-          IPMIFruProperty: Type
-          IPMIFruSection: Chassis
-
-0x50:
-  /system/chassis/motherboard/bmc:
-    entityID: 6
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: FRU File ID
-          IPMIFruSection: Board
-
-0x52:
-  /system/chassis/pdb:
-    entityID: 21
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: FRU File ID
-          IPMIFruSection: Board
-
-0x57:
-  /system/chassis/fp:
-    entityID: 2
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: FRU File ID
-          IPMIFruSection: Board
-
-0x20:
-  /system/chassis/motherboard/mezzanine8/memory_riser:
-    entityID: 8
-    entityInstance: 1
-    interfaces: &riser
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: FRU File ID
-          IPMIFruSection: Board
-
-0x21:
-  /system/chassis/motherboard/mezzanine7/memory_riser:
-    entityID: 8
-    entityInstance: 2
-    interfaces:
-      <<: *riser
-
-0x22:
-  /system/chassis/motherboard/mezzanine6/memory_riser:
-    entityID: 8
-    entityInstance: 3
-    interfaces:
-      <<: *riser
-
-0x23:
-  /system/chassis/motherboard/mezzanine5/memory_riser:
-    entityID: 8
-    entityInstance: 4
-    interfaces:
-      <<: *riser
-
-0x24:
-  /system/chassis/motherboard/mezzanine4/memory_riser:
-    entityID: 8
-    entityInstance: 5
-    interfaces:
-      <<: *riser
-
-0x25:
-  /system/chassis/motherboard/mezzanine3/memory_riser:
-    entityID: 8
-    entityInstance: 6
-    interfaces:
-      <<: *riser
-
-0x26:
-  /system/chassis/motherboard/mezzanine2/memory_riser:
-    entityID: 8
-    entityInstance: 7
-    interfaces:
-      <<: *riser
-
-0x27:
-  /system/chassis/motherboard/mezzanine1/memory_riser:
-    entityID: 8
-    entityInstance: 8
-    interfaces:
-      <<: *riser
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map-native.bb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map-native.bb
deleted file mode 100644
index 951a55f..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map-native.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Quanta Q71l IPMI to DBus Sensor mapping."
-PR = "r1"
-
-inherit native
-inherit phosphor-ipmi-host
-inherit obmc-phosphor-license
-
-PROVIDES += "virtual/phosphor-ipmi-sensor-inventory"
-
-SRC_URI += "file://config.yaml"
-
-S = "${WORKDIR}"
-
-do_install() {
-	DEST=${D}${sensor_datadir}
-        install -d ${DEST}
-	install config.yaml ${DEST}/sensor.yaml
-}
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map/config.yaml b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map/config.yaml
deleted file mode 100644
index fb0ccfc..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map/config.yaml
+++ /dev/null
@@ -1,523 +0,0 @@
-0xD0:
-  sensorType: 0x01
-  path: /xyz/openbmc_project/extsensors/margin/fleeting0
-  sensorReadingType: 0x01
-  multiplierM: 511
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-  scale: -3
-  mutability: Mutability::Write|Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xF0:
-  sensorType: 0x01
-  path: /xyz/openbmc_project/sensors/temperature/temp2_inlet
-  sensorReadingType: 0x01
-  multiplierM: 511
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xF1:
-  sensorType: 0x01
-  path: /xyz/openbmc_project/sensors/temperature/temp1
-  sensorReadingType: 0x01
-  multiplierM: 511
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xF2:
-  sensorType: 0x01
-  path: /xyz/openbmc_project/sensors/temperature/temp3
-  sensorReadingType: 0x01
-  multiplierM: 511
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xB0:
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan1
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xC0:
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan1
-  sensorReadingType: 0x01
-  multiplierM: 1
-  offsetB: 0
-  bExp: 0
-  mutability: Mutability::Write
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Control.FanPwm:
-      Target:
-        Offsets:
-          0xFF:
-            type: uint64_t
-
-0xB1:
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan2
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xC1:
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan2
-  sensorReadingType: 0x01
-  multiplierM: 1
-  offsetB: 0
-  bExp: 0
-  mutability: Mutability::Write
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Control.FanPwm:
-      Target:
-        Offsets:
-          0xFF:
-            type: uint64_t
-
-0xB2:
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan3
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xC2:
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan3
-  sensorReadingType: 0x01
-  multiplierM: 1
-  offsetB: 0
-  bExp: 0
-  mutability: Mutability::Write
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Control.FanPwm:
-      Target:
-        Offsets:
-          0xFF:
-            type: uint64_t
-
-0xB3:
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan4
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xC3:
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan4
-  sensorReadingType: 0x01
-  multiplierM: 1
-  offsetB: 0
-  bExp: 0
-  mutability: Mutability::Write
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Control.FanPwm:
-      Target:
-        Offsets:
-          0xFF:
-            type: uint64_t
-
-0xB4:
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan5
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xB5:
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan6
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xB6:
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan7
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xB7:
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan8
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xE0:
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/p3v3_scaled
-  sensorReadingType: 0x01
-  multiplierM: 64
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xE1:
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/p5v_scaled
-  sensorReadingType: 0x01
-  multiplierM: 64
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xE2:
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/p12v_aux_scaled
-  sensorReadingType: 0x01
-  multiplierM: 64
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xE3:
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/p1v1_ssb
-  sensorReadingType: 0x01
-  multiplierM: 64
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xE4:
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/pvcc_cpu0
-  sensorReadingType: 0x01
-  multiplierM: 64
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xE5:
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/pvcc_cpu1
-  sensorReadingType: 0x01
-  multiplierM: 64
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xE6:
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/p3v3_aux_scaled
-  sensorReadingType: 0x01
-  multiplierM: 64
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xE7:
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/p5v_aux_scaled
-  sensorReadingType: 0x01
-  multiplierM: 64
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xE8:
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/pvcc_cpu2
-  sensorReadingType: 0x01
-  multiplierM: 64
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xE9:
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/pvcc_cpu3
-  sensorReadingType: 0x01
-  multiplierM: 64
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xEA:
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/p12v_scaled
-  sensorReadingType: 0x01
-  multiplierM: 64
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
-
-0xEB:
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/p3v_vbat
-  sensorReadingType: 0x01
-  multiplierM: 64
-  offsetB: 0
-  bExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  mutability: Mutability::Read
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0x0:
-            type: int64_t
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/host-gpio.service b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/host-gpio.service
deleted file mode 100644
index 159b3cc..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/host-gpio.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Configure GPIOs for Host Power Control
-
-[Service]
-Restart=no
-RemainAfterExit=true
-Type=oneshot
-ExecStart=/usr/bin/env init_once.sh
-SyslogIdentifier=init_once.sh
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/host-poweroff.service b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/host-poweroff.service
deleted file mode 100644
index 9b96ce7..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/host-poweroff.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Stop Host
-Requires=host-gpio.service
-After=host-gpio.service
-Conflicts=obmc-chassis-power-on@0.target
-
-[Service]
-RemainAfterExit=yes
-Type=oneshot
-ExecStart=/usr/bin/env poweroff.sh
-SyslogIdentifier=poweroff.sh
-
-[Install]
-WantedBy=obmc-chassis-power-off@0.target
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/host-poweron.service b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/host-poweron.service
deleted file mode 100644
index 69720c9..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/host-poweron.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Start Host
-Requires=host-gpio.service
-After=host-gpio.service
-Conflicts=obmc-chassis-poweroff@0.target
-
-[Service]
-RemainAfterExit=yes
-Type=oneshot
-ExecStart=/usr/bin/env poweron.sh
-SyslogIdentifier=poweron.sh
-
-[Install]
-WantedBy=obmc-chassis-poweron@0.target
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/init_once.sh b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/init_once.sh
deleted file mode 100755
index 205ecaf..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/init_once.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Set all output GPIOs as such and drive them with reasonable values.
-function set_gpio_active_low() {
-  if [ $# -ne 2 ]; then
-    echo "set_gpio_active_low: need both GPIO# and initial level";
-    return;
-  fi
-
-  echo $1 > /sys/class/gpio/export
-  echo 1 > /sys/class/gpio/gpio$1/active_low
-  echo $2 > /sys/class/gpio/gpio$1/direction
-}
-
-GPIO_BASE=$(cat /sys/devices/platform/ahb/ahb:apb/1e780000.gpio/gpio/*/base)
-
-# FM_BMC_READY_N, GPIO Q4, active low
-set_gpio_active_low $((${GPIO_BASE} + 128 + 4)) high
-
-# FM_BMC_SSB_SMI_LPC_N, GPIO Q6, active low
-set_gpio_active_low $((${GPIO_BASE} + 128 + 6)) high
-
-# FM_BMC_SYS_THROTTLE_N, GPIO A3, active low
-set_gpio_active_low $((${GPIO_BASE} + 0 + 3)) high
-
-# FM_BMC_SSB_SCI_LPC_N, GPIO E4, active low
-set_gpio_active_low $((${GPIO_BASE} + 32 + 4)) high
-
-# FP_PWR_BTN_PASS_R_N, GPIO D3, active low
-set_gpio_active_low $((${GPIO_BASE} + 24 + 3)) high
-
-exit 0;
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweroff.sh b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweroff.sh
deleted file mode 100755
index 8e0dae3..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweroff.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-GPIO_BASE=$(cat /sys/devices/platform/ahb/ahb:apb/1e780000.gpio/gpio/*/base)
-GPIO_NUM=$(($GPIO_BASE + 24 + 3))
-
-echo 1 > /sys/class/gpio/gpio${GPIO_NUM}/value
-sleep 5
-echo 0 > /sys/class/gpio/gpio${GPIO_NUM}/value
-
-exit 0;
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweron.sh b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweron.sh
deleted file mode 100755
index f925a33..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweron.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-GPIO_BASE=$(cat /sys/devices/platform/ahb/ahb:apb/1e780000.gpio/gpio/*/base)
-GPIO_NUM=$(($GPIO_BASE + 24 + 3))
-
-echo 1 > /sys/class/gpio/gpio${GPIO_NUM}/value
-sleep 1
-echo 0 > /sys/class/gpio/gpio${GPIO_NUM}/value
-
-exit 0;
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb
deleted file mode 100644
index fd02327..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-FILESEXTRAPATHS_append := "${THISDIR}/files:"
-
-inherit systemd
-inherit obmc-phosphor-license
-inherit obmc-phosphor-systemd
-
-S = "${WORKDIR}/"
-
-SRC_URI = "file://init_once.sh \
-           file://poweroff.sh \
-           file://poweron.sh \
-           file://host-gpio.service \
-           file://host-poweroff.service \
-           file://host-poweron.service"
-
-DEPENDS = "systemd"
-RDEPENDS_${PN} = "bash"
-
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "host-gpio.service host-poweron.service host-poweroff.service"
-
-do_install() {
-    install -d ${D}/usr/sbin
-    install -m 0755 ${S}init_once.sh ${D}/${sbindir}/
-    install -m 0755 ${S}poweroff.sh ${D}/${sbindir}/
-    install -m 0755 ${S}poweron.sh ${D}/${sbindir}/
-}
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
deleted file mode 100644
index 19365c2..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ /dev/null
@@ -1,17 +0,0 @@
-inherit obmc-phosphor-utils
-
-FILESEXTRAPATHS_prepend_quanta-q71l := "${THISDIR}/${PN}:"
-
-# More conf files can be added as sensors are added.
-
-ITEMS = "pwm-tacho-controller@1e786000.conf"
-
-TEMPS = "tmp75@4c tmp75@4e tmp75@4f"
-TEMPBASE = "ahb/apb/i2c@1e78a000/i2c-bus@80/{0}.conf"
-ITEMS += "${@compose_list(d, 'TEMPBASE', 'TEMPS')}"
-ITEMS += "iio-hwmon.conf"
-
-ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_quanta-q71l := " ${@compose_list(d, 'ENVS', 'ITEMS')}"
-
-EXTRA_OECONF_append_quanta-q71l = " --enable-negative-errno-on-fail"
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf
deleted file mode 100644
index 4ac0ebf..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf
+++ /dev/null
@@ -1 +0,0 @@
-LABEL_temp1=temp2_inlet
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf
deleted file mode 100644
index 504e4cf..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf
+++ /dev/null
@@ -1 +0,0 @@
-LABEL_temp1=temp3
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf
deleted file mode 100644
index 10ec265..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf
+++ /dev/null
@@ -1 +0,0 @@
-LABEL_temp1=temp1
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf
deleted file mode 100644
index cb8d54e..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-LABEL_in1=p3v3_scaled
-GAIN_in1=1.62
-LABEL_in2=p5v_scaled
-GAIN_in2=2.47
-LABEL_in3=p12v_aux_scaled
-GAIN_in3=6.01
-LABEL_in4=p1v1_ssb
-LABEL_in5=pvcc_cpu0
-LABEL_in6=pvcc_cpu1
-LABEL_in7=p3v3_aux_scaled
-GAIN_in7=1.62
-LABEL_in8=p5v_aux_scaled
-GAIN_in8=2.47
-LABEL_in9=pvcc_cpu2
-LABEL_in10=pvcc_cpu3
-LABEL_in11=p12v_scaled
-GAIN_in11=6.01
-LABEL_in12=p3v_vbat
-GAIN_in12=1.4992504
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/pwm-tacho-controller@1e786000.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/pwm-tacho-controller@1e786000.conf
deleted file mode 100644
index dfdecb4..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/pwm-tacho-controller@1e786000.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-LABEL_fan1=fan1
-LABEL_fan2=fan2
-LABEL_fan3=fan3
-LABEL_fan4=fan4
-LABEL_fan5=fan5
-LABEL_fan6=fan6
-LABEL_fan7=fan7
-LABEL_fan8=fan8
-
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/spictrl/files/spimaster.py b/meta-quanta/meta-q71l/recipes-phosphor/spictrl/files/spimaster.py
deleted file mode 100644
index dd08372..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/spictrl/files/spimaster.py
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright (C) 2017 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#!/usr/bin/env python
-"""Basic utility for reading and writing registers on an ASPEED BMC.
-
-The values hardcoded are for the ASPEED AST2400.
-"""
-
-import subprocess
-import sys
-
-IO_TOOL = 'devmem'
-PROTECTION_KEY = '0x1E6E2000'
-HWTRAP = '0x1E6E2070'
-# The AST2400 SCU Password (as int for write_register)
-SCU_PASSWORD = 0x1688A8A8
-
-# Bits 13:12
-SPI_MASK = 0xffffcfff
-# Enable SPI Master
-SPI_MASTER = 0x1000
-# Enable SPI Master and SPI Slave to AHB Bridge
-SPI_MASTER_SLAVE = 0x2000
-# Enable SPI Pass-through
-SPI_BYPASS = 0x3000
-
-
-def read_register(address):
-    """Run a tool to read a register value.
-
-    This will convert it to an integer.
-    """
-
-    output = subprocess.check_output([IO_TOOL, address]).replace('\n', '')
-    value = int(output, 16)
-    return value
-
-
-def write_register(address, value):
-    """Run a tool to write the 32-bit register value."""
-
-    subprocess.check_output([IO_TOOL, address, '32', '0x%x' % value])
-    return
-
-
-def set_master(value):
-    """Set Hardware Strapping to SPI Master."""
-
-    print 'Setting to "SPI Master"'
-
-    masked = value & SPI_MASK
-    masked |= SPI_MASTER
-
-    print 'setting: 0x%x' % masked
-    write_register(HWTRAP, masked)
-
-
-def set_ahb_bridge(value):
-    """Set hardware strapping to spi master and spi-slave to ahb."""
-
-    print 'Setting to "SPI Master and SPI Slave to AHB Bridge"'
-    masked = value & SPI_MASK
-    masked |= SPI_MASTER_SLAVE
-
-    print 'setting: 0x%x' % masked
-    write_register(HWTRAP, masked)
-
-
-def set_bypass(value):
-    """Set hardware strappign to spi bypass."""
-
-    print 'Setting to "Enable SPI Pass-through"'
-    masked = value & SPI_MASK
-    masked |= SPI_BYPASS
-
-    print 'setting: 0x%x' % masked
-    write_register(HWTRAP, masked)
-
-
-def usage():
-    """Print usage string."""
-
-    print 'usage: %s master|bridge|bypass' % sys.argv[0]
-    print 'master sets the BMC SPI to Master.'
-    print ('bridge sets the BMC SPI to Master-Slave bridge to AHB (for BIOS ' +
-        'Update).')
-    print 'bypass sets the BMC SPI to Bypass (default).'
-
-
-def main():
-    """Main entry point for execution."""
-
-    if len(sys.argv) != 2:
-        usage()
-        sys.exit(-1)
-
-    ctrl = sys.argv[1].lower()
-    if ctrl not in ('master', 'bridge', 'bypass'):
-        usage()
-        sys.exit(-1)
-
-    locked = False
-    # Check if locked
-    value = read_register(PROTECTION_KEY)
-    if value == 1:
-        print 'Presently unlocked'
-    else:
-        print 'Presently locked'
-        locked = True
-
-    # if Locked we need to unlock it.
-    if locked:
-        write_register(PROTECTION_KEY, SCU_PASSWORD)
-
-    # Read the value.
-    value = read_register(HWTRAP)
-    if value & SPI_BYPASS == SPI_BYPASS:
-        print 'Presently set to bypass'
-    elif value & SPI_MASTER == SPI_MASTER:
-        print 'Presently set to master'
-    elif value & SPI_MASTER_SLAVE == SPI_MASTER_SLAVE:
-        print 'Presently set to master-slave'
-
-    if ctrl == 'master':
-        set_master(value)
-    elif ctrl == 'bridge':
-        set_ahb_bridge(value)
-    elif ctrl == 'bypass':
-        set_bypass(value)
-
-    # We leave it unlocked in case it was locked.
-    # we could lock it.
-    # TODO(venture): lock it by writing any non-password value.
-
-if __name__ == '__main__':
-    main()
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/spictrl/spictrl.bb b/meta-quanta/meta-q71l/recipes-phosphor/spictrl/spictrl.bb
deleted file mode 100644
index 5b2fcf2..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/spictrl/spictrl.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-# Should RDEPENDS on python at the very least.
-FILESEXTRAPATHS_append := "${THISDIR}/files:"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://spimaster.py;beginline=1;endline=13;md5=b86c59990b35609be34a0ec322a3cfff"
-
-S = "${WORKDIR}/"
-
-SRC_URI = "file://spimaster.py"
-
-DEPENDS = "python"
-
-FILES_${PN} += "*"
-
-do_install() {
-    install -d ${D}/home
-    install -d ${D}/home/root
-    install -m 0755 ${S}/spimaster.py ${D}/home/root/.
-}
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config.bb b/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config.bb
deleted file mode 100644
index 647633f..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY = "Quanta Q71l board wiring"
-DESCRIPTION = "Board wiring information for the Quanta Q71l system."
-PR = "r1"
-
-inherit allarch
-inherit setuptools
-inherit pythonnative
-inherit obmc-phosphor-license
-
-PROVIDES += "virtual/obmc-inventory-data"
-RPROVIDES_${PN} += "virtual-obmc-inventory-data"
-
-DEPENDS += "python"
-
-S = "${WORKDIR}"
-SRC_URI += "file://Quanta-q71l.py"
-
-# the following is unnecessary.
-python() {
-	machine = d.getVar('MACHINE', True).capitalize() + '.py'
-	d.setVar('_config_in_skeleton', machine)
-}
-
-do_make_setup() {
-        cp ${S}/${_config_in_skeleton} \
-                ${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
-}
-
-addtask make_setup after do_patch before do_configure
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config/Quanta-q71l.py b/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config/Quanta-q71l.py
deleted file mode 100644
index ca7cb20..0000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config/Quanta-q71l.py
+++ /dev/null
@@ -1,48 +0,0 @@
-## System states
-##   state can change to next state in 2 ways:
-##   - a process emits a GotoSystemState signal with state name to goto
-##   - objects specified in EXIT_STATE_DEPEND have started
-SYSTEM_STATES = [
-    'BASE_APPS',
-    'BMC_STARTING',
-    'BMC_READY',
-    'HOST_POWERING_ON',
-    'HOST_POWERED_ON',
-    'HOST_BOOTING',
-    'HOST_BOOTED',
-    'HOST_POWERED_OFF',
-]
-
-EXIT_STATE_DEPEND = {
-    'BASE_APPS' : {
-        '/xyz/openbmc_poroject/sensors': 0,
-    },
-    'BMC_STARTING' : {
-        '/xyz/openbmc_project/control/chassis0': 0,
-    },
-}
-
-FRU_INSTANCES = {}
-
-# I believe these numbers need to match the yaml file used to create the c++ ipmi map.
-# the devices have types, but I don't believe that factors in here, I think these are
-# just unique IDs.
-ID_LOOKUP = {
-    'FRU' : {},
-    # The number at the end needs to match the FRU ID.
-    # https://github.com/openbmc/skeleton/blob/master/pysystemmgr/system_manager.py#L143
-    # The parameter for it is of type 'y' (unsigned 8-bit integer) presumably decimal?
-    'FRU_STR' : {},
-    'SENSOR' : {},
-    'GPIO_PRESENT' : {}
-}
-
-GPIO_CONFIG = {}
-HWMON_CONFIG = {}
-GPIO_CONFIGS = {}
-
-# Miscellaneous non-poll sensor with system specific properties.
-# The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
-MISC_SENSORS = {}
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4