diff --git a/meta-firestone/README.md b/meta-firestone/README.md
deleted file mode 100644
index cc10d89..0000000
--- a/meta-firestone/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Firestone
-================
-
-This is the Firestone machine layer.
-
-Firestone is no longer a supported machine.
diff --git a/meta-firestone/conf/bblayers.conf.sample b/meta-firestone/conf/bblayers.conf.sample
deleted file mode 100644
index 6aabd70..0000000
--- a/meta-firestone/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,39 +0,0 @@
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-LCONF_VERSION = "7"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
-  ##OEROOT##/import-layers/meta-virtualization \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone \
-  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
-  ##OEROOT##/import-layers/meta-virtualization \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone \
-  "
diff --git a/meta-firestone/conf/conf-notes.txt b/meta-firestone/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a..0000000
--- a/meta-firestone/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-firestone/conf/layer.conf b/meta-firestone/conf/layer.conf
deleted file mode 100644
index 43a06a9..0000000
--- a/meta-firestone/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 += "firestone"
-BBFILE_PATTERN_firestone = ""
diff --git a/meta-firestone/conf/local.conf.sample b/meta-firestone/conf/local.conf.sample
deleted file mode 100644
index 1b0f3c1..0000000
--- a/meta-firestone/conf/local.conf.sample
+++ /dev/null
@@ -1,234 +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 ??= "firestone"
-
-#
-# 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-openpower"
-# 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"
-
-
-# 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-firestone/conf/machine/firestone.conf b/meta-firestone/conf/machine/firestone.conf
deleted file mode 100644
index 83f91e0..0000000
--- a/meta-firestone/conf/machine/firestone.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
-
-require conf/machine/include/ast2400.inc
-require conf/machine/include/obmc-bsp-common.inc
-require conf/machine/include/ibm.inc
-require conf/machine/include/p8.inc
-
-UBOOT_MACHINE_firestone = "ast_g4_phy_config"
-UBOOT_ENTRYPOINT = "0x40008000"
-UBOOT_LOADADDRESS = "0x40008000"
-
-FLASH_SIZE = "32768"
-
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "firestone-ipmi-inventory-map-native"
diff --git a/meta-firestone/recipes-kernel/linux/linux-obmc/firestone.cfg b/meta-firestone/recipes-kernel/linux/linux-obmc/firestone.cfg
deleted file mode 100644
index 01fb1c1..0000000
--- a/meta-firestone/recipes-kernel/linux/linux-obmc/firestone.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_HWMON=y
-CONFIG_SENSORS_TMP421=y
-CONFIG_SENSORS_MAX31785=y
diff --git a/meta-firestone/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-firestone/recipes-kernel/linux/linux-obmc_%.bbappend
deleted file mode 100644
index b67f87c..0000000
--- a/meta-firestone/recipes-kernel/linux/linux-obmc_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:"
-SRC_URI += "file://firestone.cfg"
diff --git a/meta-firestone/recipes-phosphor/console/obmc-console.bbappend b/meta-firestone/recipes-phosphor/console/obmc-console.bbappend
deleted file mode 100644
index 42d8e5d..0000000
--- a/meta-firestone/recipes-phosphor/console/obmc-console.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_firestone := "${THISDIR}/${PN}:"
diff --git a/meta-firestone/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-firestone/recipes-phosphor/console/obmc-console/obmc-console.conf
deleted file mode 100644
index a5ba3f3..0000000
--- a/meta-firestone/recipes-phosphor/console/obmc-console/obmc-console.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-lpc-address = 0x3f8
-sirq = 4
-local-tty = ttyS0
-local-tty-baud = 115200
diff --git a/meta-firestone/recipes-phosphor/host/checkstop-monitor.bbappend b/meta-firestone/recipes-phosphor/host/checkstop-monitor.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-firestone/recipes-phosphor/host/checkstop-monitor.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-firestone/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop b/meta-firestone/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop
deleted file mode 100644
index e080664..0000000
--- a/meta-firestone/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop
+++ /dev/null
@@ -1,4 +0,0 @@
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=56
-POLARITY=1
-TARGET=obmc-host-crash@0.target
diff --git a/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map-native.bb b/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map-native.bb
deleted file mode 100644
index 9027669..0000000
--- a/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map-native.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Firestone 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() {
-        # TODO: install this to inventory_datadir
-        # after ipmi-fru-parser untangles the host
-        # firmware config from the machine inventory.
-        DEST=${D}${config_datadir}
-
-        install -d ${DEST}
-        install config.yaml ${DEST}
-}
diff --git a/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map/config.yaml b/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map/config.yaml
deleted file mode 100644
index 244ded2..0000000
--- a/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map/config.yaml
+++ /dev/null
@@ -1,1160 +0,0 @@
-1:
-  /system/chassis/motherboard/cpu0:
-    entityID: 3
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Custom Field 2
-          IPMIFruSection: Board
-          IPMIFruValueDelimiter: 58
-      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
-2:
-  /system/chassis/motherboard/cpu1:
-    entityID: 3
-    entityInstance: 2
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Custom Field 2
-          IPMIFruSection: Board
-          IPMIFruValueDelimiter: 58
-      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
-          Value: False
-3:
-  /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: 7
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Chassis
-        Model:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Chassis
-4:
-  /system/chassis/motherboard/membuf0:
-    entityID: 8
-    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
-5:
-  /system/chassis/motherboard/membuf1:
-    entityID: 8
-    entityInstance: 2
-    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
-6:
-  /system/chassis/motherboard/membuf2:
-    entityID: 8
-    entityInstance: 3
-    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
-7:
-  /system/chassis/motherboard/membuf3:
-    entityID: 8
-    entityInstance: 4
-    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
-8:
- /system/chassis/motherboard/membuf4:
-    entityID: 8
-    entityInstance: 5
-    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
-9:
-  /system/chassis/motherboard/membuf5:
-    entityID: 8
-    entityInstance: 6
-    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
-10:
-  /system/chassis/motherboard/membuf6:
-    entityID: 8
-    entityInstance: 7
-    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
-11:
-  /system/chassis/motherboard/membuf7:
-    entityID: 8
-    entityInstance: 8
-    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
-12:
-  /system/chassis/motherboard/dimm0:
-    entityID: 32
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-13:
-  /system/chassis/motherboard/dimm1:
-    entityID: 32
-    entityInstance: 2
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-14:
-  /system/chassis/motherboard/dimm2:
-    entityID: 32
-    entityInstance: 3
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-15:
-  /system/chassis/motherboard/dimm3:
-    entityID: 32
-    entityInstance: 4
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-16:
-  /system/chassis/motherboard/dimm4:
-    entityID: 32
-    entityInstance: 5
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-17:
-  /system/chassis/motherboard/dimm5:
-    entityID: 32
-    entityInstance: 6
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-18:
-  /system/chassis/motherboard/dimm6:
-    entityID: 32
-    entityInstance: 7
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-19:
-  /system/chassis/motherboard/dimm7:
-    entityID: 32
-    entityInstance: 8
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-20:
-  /system/chassis/motherboard/dimm8:
-    entityID: 32
-    entityInstance: 9
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-21:
-  /system/chassis/motherboard/dimm9:
-    entityID: 32
-    entityInstance: 10
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-22:
-  /system/chassis/motherboard/dimm10:
-    entityID: 32
-    entityInstance: 11
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-23:
-  /system/chassis/motherboard/dimm11:
-    entityID: 32
-    entityInstance: 12
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-24:
-  /system/chassis/motherboard/dimm12:
-    entityID: 32
-    entityInstance: 13
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-25:
-  /system/chassis/motherboard/dimm13:
-    entityID: 32
-    entityInstance: 14
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-26:
-  /system/chassis/motherboard/dimm14:
-    entityID: 32
-    entityInstance: 15
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-27:
-  /system/chassis/motherboard/dimm15:
-    entityID: 32
-    entityInstance: 16
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-28:
-  /system/chassis/motherboard/dimm16:
-    entityID: 32
-    entityInstance: 17
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-29:
-  /system/chassis/motherboard/dimm17:
-    entityID: 32
-    entityInstance: 18
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-30:
-  /system/chassis/motherboard/dimm18:
-    entityID: 32
-    entityInstance: 19
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-31:
-  /system/chassis/motherboard/dimm19:
-    entityID: 32
-    entityInstance: 20
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-32:
-  /system/chassis/motherboard/dimm20:
-    entityID: 32
-    entityInstance: 21
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-33:
-  /system/chassis/motherboard/dimm21:
-    entityID: 32
-    entityInstance: 22
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-34:
-  /system/chassis/motherboard/dimm22:
-    entityID: 32
-    entityInstance: 23
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-35:
-  /system/chassis/motherboard/dimm23:
-    entityID: 32
-    entityInstance: 24
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-36:
-  /system/chassis/motherboard/dimm24:
-    entityID: 32
-    entityInstance: 25
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-37:
-  /system/chassis/motherboard/dimm25:
-    entityID: 32
-    entityInstance: 26
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-38:
-  /system/chassis/motherboard/dimm26:
-    entityID: 32
-    entityInstance: 27
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-39:
-  /system/chassis/motherboard/dimm27:
-    entityID: 32
-    entityInstance: 28
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-40:
-  /system/chassis/motherboard/dimm28:
-    entityID: 32
-    entityInstance: 29
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-41:
-  /system/chassis/motherboard/dimm29:
-    entityID: 32
-    entityInstance: 30
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-42:
-  /system/chassis/motherboard/dimm30:
-    entityID: 32
-    entityInstance: 31
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
-43:
-  /system/chassis/motherboard/dimm31:
-    entityID: 32
-    entityInstance: 32
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Product
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Product
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Product
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Product
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Product
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
diff --git a/meta-firestone/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend b/meta-firestone/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-firestone/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-firestone/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml b/meta-firestone/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml
deleted file mode 100644
index 5b60059..0000000
--- a/meta-firestone/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml
+++ /dev/null
@@ -1,352 +0,0 @@
-/system/chassis/motherboard/cpu0:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/cpu1:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf0:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf1:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf2:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf3:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf4:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf5:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf6:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/membuf7:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'false'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm0:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm1:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm2:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm3:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm4:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm5:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm6:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm7:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm8:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm9:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm10:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm11:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm12:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm13:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm14:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm15:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm16:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm17:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm18:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm19:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm20:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm21:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm22:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm23:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm24:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm25:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm26:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm27:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm28:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm29:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm30:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/motherboard/dimm31:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'true'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
diff --git a/meta-firestone/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend b/meta-firestone/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-firestone/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-firestone/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml b/meta-firestone/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml
deleted file mode 100755
index 75a1fa4..0000000
--- a/meta-firestone/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml
+++ /dev/null
@@ -1,1699 +0,0 @@
-0x05:
-  sensorType: 0x0F
-  path: /xyz/openbmc_project/state/host0
-  sensorReadingType: 0x6F
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: eventdata2
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Boot.Progress:
-      BootProgress:
-        Offsets:
-          0x13:
-            type: string
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.OSStart
-          0x00:
-            type: string
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.Unspecified
-          0x01:
-            type: string
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MemoryInit
-          0x07:
-            type: string
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.PCIInit
-          0x14:
-            type: string
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MotherboardInit
-          0x03:
-            type: string
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.SecondaryProcInit
-0x08:
-  sensorType: 0x07
-  path: /org/open_power/control/occ_4_0050
-  sensorReadingType: 0x09
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    org.open_power.OCC.Status:
-      OccActive:
-        Offsets:
-          0x00:
-            assert: false
-            deassert: true
-            type: bool
-          0x01:
-            assert: true
-            deassert: false
-            type: bool
-0x09:
-  sensorType: 0x07
-  path: /org/open_power/control/occ_5_0051
-  sensorReadingType: 0x09
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    org.open_power.OCC.Status:
-      OccActive:
-        Offsets:
-          0x00:
-            assert: false
-            deassert: true
-            type: bool
-          0x01:
-            assert: true
-            deassert: false
-            type: bool
-0x0c:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-0x0e:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-0x1e:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm3
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x1f:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm2
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x20:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm1
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x21:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm0
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x22:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm7
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x23:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm6
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x24:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm5
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x25:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm4
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x26:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm11
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x27:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm10
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x28:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm9
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x29:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm8
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x2a:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm15
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x2b:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm14
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x2c:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm13
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x2d:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm12
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x2e:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm19
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x2f:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm18
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x30:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm17
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x31:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm16
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x32:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm23
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x33:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm22
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x34:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm21
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x35:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm20
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x36:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm27
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x37:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm26
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x38:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm25
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x39:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm24
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x3a:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm31
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x3b:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm30
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x3c:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm29
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x3d:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm28
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x04:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x06:
-            assert: true
-            deassert: false
-            type: bool
-0x3e:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core0
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x3f:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core1
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x40:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core2
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x41:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core3
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x42:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core4
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x43:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core5
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x44:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core6
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x45:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core7
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x46:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core8
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x47:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core9
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x48:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core10
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x49:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core11
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x4a:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core0
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x4b:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core1
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x4c:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core2
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x4d:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core3
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x4e:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core4
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x4f:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core5
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x50:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core6
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x51:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core7
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x52:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core8
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x53:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core9
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x54:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core10
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x55:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core11
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Prereqs:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-        Offsets:
-          0x08:
-            assert: false
-            deassert: true
-            type: bool
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x07:
-            assert: true
-            deassert: false
-            type: bool
-            skipOn: deassert
-0x5F:
-  sensorType: 0xC3
-  path: /xyz/openbmc_project/state/host0
-  sensorReadingType: 0x6F
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingAssertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.Control.Boot.RebootAttempts:
-      AttemptsLeft:
-        Offsets:
-          0xFF:
-            type: uint32_t
-0xB5:
-  sensorType: 0x1F
-  path: /xyz/openbmc_project/state/host0
-  sensorReadingType: 0x6F
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.State.OperatingSystem.Status:
-      OperatingSystemState:
-        Offsets:
-          0x02:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.PXEBoot
-            type: string
-          0x06:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.BootComplete
-            type: string
-          0x04:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CDROMBoot
-            type: string
-          0x01:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CBoot
-            type: string
-          0x03:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.DiagBoot
-            type: string
-          0x05:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.ROMBoot
-            type: string
diff --git a/meta-firestone/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-firestone/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
deleted file mode 100644
index e5b837a..0000000
--- a/meta-firestone/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-RDEPENDS_${PN}-inventory += "openpower-occ-control"
diff --git a/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
deleted file mode 100644
index 220e891..0000000
--- a/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ /dev/null
@@ -1,14 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-NAMES = " \
-        i2c@1e78a000/i2c-bus@140/occ-hwmon@50 \
-        i2c@1e78a000/i2c-bus@180/occ-hwmon@51 \
-        i2c@1e78a000/i2c-bus@400/rtc@68 \
-        "
-
-ITEMSFMT = "ahb/apb/{0}.conf"
-
-ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}"
-
-ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}"
diff --git a/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/occ-hwmon@50.conf b/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/occ-hwmon@50.conf
deleted file mode 100644
index 71d9952..0000000
--- a/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/occ-hwmon@50.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-MODE_temp1 = "label"
-MODE_temp2 = "label"
-MODE_temp3 = "label"
-MODE_temp4 = "label"
-MODE_temp5 = "label"
-MODE_temp6 = "label"
-MODE_temp7 = "label"
-MODE_temp8 = "label"
-MODE_temp9 = "label"
-MODE_temp10 = "label"
-MODE_temp11 = "label"
-MODE_temp12 = "label"
-MODE_temp13 = "label"
-MODE_temp14 = "label"
-MODE_temp15 = "label"
-MODE_temp16 = "label"
-MODE_temp17 = "label"
-MODE_temp18 = "label"
-MODE_temp19 = "label"
-MODE_temp20 = "label"
-MODE_temp21 = "label"
-MODE_temp22 = "label"
-MODE_temp23 = "label"
-MODE_temp24 = "label"
-MODE_temp25 = "label"
-MODE_temp26 = "label"
-MODE_temp27 = "label"
-MODE_temp28 = "label"
-MODE_temp29 = "label"
-MODE_temp30 = "label"
-MODE_temp31 = "label"
-MODE_temp32 = "label"
-
-LABEL_temp105 = "dimm0"
-LABEL_temp106 = "dimm1"
-LABEL_temp107 = "dimm2"
-LABEL_temp108 = "dimm3"
-LABEL_temp109 = "dimm4"
-LABEL_temp110 = "dimm5"
-LABEL_temp111 = "dimm6"
-LABEL_temp112 = "dimm7"
-LABEL_temp113 = "dimm8"
-LABEL_temp114 = "dimm9"
-LABEL_temp115 = "dimm10"
-LABEL_temp116 = "dimm11"
-LABEL_temp117 = "dimm12"
-LABEL_temp118 = "dimm13"
-LABEL_temp119 = "dimm14"
-LABEL_temp120 = "dimm15"
-
-LABEL_temp137 = "core0"
-LABEL_temp138 = "core1"
-LABEL_temp139 = "core2"
-LABEL_temp140 = "core3"
-LABEL_temp141 = "core4"
-LABEL_temp142 = "core5"
-LABEL_temp143 = "core6"
-LABEL_temp144 = "core7"
-LABEL_temp145 = "core8"
-LABEL_temp146 = "core9"
-LABEL_temp147 = "core10"
-LABEL_temp148 = "core11"
-
-LABEL_temp192 = "membuf0"
-LABEL_temp193 = "membuf1"
-LABEL_temp194 = "membuf2"
-LABEL_temp195 = "membuf3"
-
-LABEL_power1 = "cpu0"
-LABEL_power2 = "cpu1"
-LABEL_power3 = "pcie0"
-LABEL_power4 = "pcie1"
-LABEL_power5 = "gpu"
-LABEL_power6 = "memory_cache"
-LABEL_power7 = "centaur0"
-LABEL_power8 = "centaur1"
-LABEL_power9 = "fan"
-
diff --git a/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/occ-hwmon@51.conf b/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/occ-hwmon@51.conf
deleted file mode 100644
index 23a9590..0000000
--- a/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/occ-hwmon@51.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-MODE_temp1 = "label"
-MODE_temp2 = "label"
-MODE_temp3 = "label"
-MODE_temp4 = "label"
-MODE_temp5 = "label"
-MODE_temp6 = "label"
-MODE_temp7 = "label"
-MODE_temp8 = "label"
-MODE_temp9 = "label"
-MODE_temp10 = "label"
-MODE_temp11 = "label"
-MODE_temp12 = "label"
-MODE_temp13 = "label"
-MODE_temp14 = "label"
-MODE_temp15 = "label"
-MODE_temp16 = "label"
-MODE_temp17 = "label"
-MODE_temp18 = "label"
-MODE_temp19 = "label"
-MODE_temp20 = "label"
-MODE_temp21 = "label"
-MODE_temp22 = "label"
-MODE_temp23 = "label"
-MODE_temp24 = "label"
-MODE_temp25 = "label"
-MODE_temp26 = "label"
-MODE_temp27 = "label"
-MODE_temp28 = "label"
-MODE_temp29 = "label"
-MODE_temp30 = "label"
-MODE_temp31 = "label"
-MODE_temp32 = "label"
-
-LABEL_temp121 = "dimm16"
-LABEL_temp122 = "dimm17"
-LABEL_temp123 = "dimm18"
-LABEL_temp124 = "dimm19"
-LABEL_temp125 = "dimm20"
-LABEL_temp126 = "dimm21"
-LABEL_temp127 = "dimm22"
-LABEL_temp128 = "dimm23"
-LABEL_temp129 = "dimm24"
-LABEL_temp130 = "dimm25"
-LABEL_temp131 = "dimm26"
-LABEL_temp132 = "dimm27"
-LABEL_temp133 = "dimm28"
-LABEL_temp134 = "dimm29"
-LABEL_temp135 = "dimm30"
-LABEL_temp136 = "dimm31"
-
-LABEL_temp149 = "core12"
-LABEL_temp150 = "core13"
-LABEL_temp151 = "core14"
-LABEL_temp152 = "core15"
-LABEL_temp153 = "core16"
-LABEL_temp154 = "core17"
-LABEL_temp155 = "core18"
-LABEL_temp156 = "core19"
-LABEL_temp157 = "core20"
-LABEL_temp158 = "core21"
-LABEL_temp159 = "core22"
-LABEL_temp160 = "core23"
-
-LABEL_temp196 = "membuf4"
-LABEL_temp197 = "membuf5"
-LABEL_temp198 = "membuf6"
-LABEL_temp199 = "membuf7"
diff --git a/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@400/rtc@68.conf b/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@400/rtc@68.conf
deleted file mode 100644
index 8b6053e..0000000
--- a/meta-firestone/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@400/rtc@68.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=rtc
-WARNLO_temp1=10000
-WARNHI_temp1=35000
diff --git a/meta-firestone/recipes-phosphor/workbook/firestone-config.bb b/meta-firestone/recipes-phosphor/workbook/firestone-config.bb
deleted file mode 100644
index 979a44c..0000000
--- a/meta-firestone/recipes-phosphor/workbook/firestone-config.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SUMMARY = "Firestone board wiring"
-DESCRIPTION = "Board wiring information for the Firestone system."
-PR = "r1"
-
-inherit config-in-skeleton
diff --git a/meta-firestone/recipes.txt b/meta-firestone/recipes.txt
deleted file mode 100644
index 3ec3f4a..0000000
--- a/meta-firestone/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