diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf
deleted file mode 100644
index a5c9082..0000000
--- a/meta-ibm/conf/layer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-            ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "ibm"
-BBFILE_PATTERN_ibm = ""
-LAYERSERIES_COMPAT_ibm = "sumo"
diff --git a/meta-ibm/conf/machine/include/ibm.inc b/meta-ibm/conf/machine/include/ibm.inc
deleted file mode 100644
index c79ddd7..0000000
--- a/meta-ibm/conf/machine/include/ibm.inc
+++ /dev/null
@@ -1 +0,0 @@
-require conf/machine/include/openpower.inc
diff --git a/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
deleted file mode 100644
index e7b9f3d..0000000
--- a/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,35 +0,0 @@
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-LCONF_VERSION = "7"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto \
-  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto \
-  "
diff --git a/meta-ibm/meta-palmetto/conf/conf-notes.txt b/meta-ibm/meta-palmetto/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a..0000000
--- a/meta-ibm/meta-palmetto/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf
deleted file mode 100644
index 17780a8..0000000
--- a/meta-ibm/meta-palmetto/conf/layer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-            ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "palmetto"
-BBFILE_PATTERN_palmetto = ""
-LAYERSERIES_COMPAT_palmetto = "sumo"
diff --git a/meta-ibm/meta-palmetto/conf/local.conf.sample b/meta-ibm/meta-palmetto/conf/local.conf.sample
deleted file mode 100644
index 8627007..0000000
--- a/meta-ibm/meta-palmetto/conf/local.conf.sample
+++ /dev/null
@@ -1,245 +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 ??= "palmetto"
-
-#
-# 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"
-
-
-#
-# Qemu configuration
-#
-# By default qemu will build with a builtin VNC server where graphical output can be
-# seen. The two lines below enable the SDL backend too. This assumes there is a
-# libsdl library available on your build system.
-PACKAGECONFIG_append_pn-qemu-native = " sdl"
-PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
-#ASSUME_PROVIDED += "libsdl-native"
-
-
-# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
-# track the version of this file when it was generated. This can safely be ignored if
-# this doesn't mean anything to you.
-CONF_VERSION = "1"
-
-# Set the root password to '0penBmc'
-INHERIT += "extrausers"
-
-EXTRA_USERS_PARAMS = " \
-  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
-  "
diff --git a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
deleted file mode 100644
index 5d71bf4..0000000
--- a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
+++ /dev/null
@@ -1,20 +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_palmetto = "ast_g4_ncsi_config"
-UBOOT_ENTRYPOINT = "0x40008000"
-UBOOT_LOADADDRESS = "0x40008000"
-
-FLASH_SIZE = "32768"
-
-PHOSPHOR_MRW_URI = "git://github.com/open-power/palmetto-xml"
-PHOSPHOR_MRW_REV = "82818682f2c2009c30d700df6d5f8897a3096e4f"
-
-PREFERRED_PROVIDER_virtual/obmc-inventory-data = "obmc-inventory"
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "palmetto-ipmi-inventory-map-native"
-PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "palmetto-led-manager-config-native"
diff --git a/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed/palmetto.cfg b/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed/palmetto.cfg
deleted file mode 100644
index 498497e..0000000
--- a/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed/palmetto.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_SENSORS_NCT7904=y
-CONFIG_EEPROM_AT24=y
-CONFIG_SENSORS_TMP421=y
diff --git a/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend
deleted file mode 100644
index 6cdb951..0000000
--- a/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:"
-SRC_URI += "file://palmetto.cfg"
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console/obmc-console.conf
deleted file mode 100644
index a5ba3f3..0000000
--- a/meta-ibm/meta-palmetto/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-ibm/meta-palmetto/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console_%.bbappend
deleted file mode 100644
index 2d33559..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop b/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop
deleted file mode 100644
index b47d0df..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop
+++ /dev/null
@@ -1,4 +0,0 @@
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=125
-POLARITY=1
-TARGET=obmc-host-crash@0.target
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend
deleted file mode 100644
index a25b65a..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " aspeed-lpc-ctrl"
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map-native.bb b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map-native.bb
deleted file mode 100644
index 2b5348a..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map-native.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "Palmetto 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-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map/config.yaml b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map/config.yaml
deleted file mode 100644
index cade45e..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map/config.yaml
+++ /dev/null
@@ -1,220 +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:
-    entityID: 23
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Chassis
-        Model:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Chassis
-
-  /system/chassis/motherboard/membuf:
-    entityID: 23
-    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
-3:
-  /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
-4:
-  /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
-5:
-  /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
-6:
-  /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
-14:
-  /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
-15:
-  /system:
-    entityID: 25
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Name
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Decorator.Revision:
-        Version:
-          IPMIFruProperty: Version
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml
deleted file mode 100644
index 5caabf1..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml
+++ /dev/null
@@ -1,73 +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:
-    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:
-    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: 'true'
-    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'
-
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml
deleted file mode 100755
index 9880d0a..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml
+++ /dev/null
@@ -1,561 +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_3_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: 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
-0x1e:
-  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
-0x1f:
-  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
-0x20:
-  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
-0x21:
-  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
-0x22:
-  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
-0x23:
-  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
-0x24:
-  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
-0x25:
-  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
-0x26:
-  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
-0x27:
-  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
-0x28:
-  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
-0x29:
-  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
-0x2a:
-  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
-0x2b:
-  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
-0x2c:
-  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
-0x2d:
-  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
-0x2f:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu
-  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
-0x32:
-  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-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config-native.bb b/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config-native.bb
deleted file mode 100644
index d633fd9..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config-native.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "Phosphor LED Group Management for Palmetto"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-
-PROVIDES += "virtual/phosphor-led-manager-config-native"
-
-SRC_URI += "file://led.yaml"
-S = "${WORKDIR}"
-
-# Copies example led layout yaml file
-do_install() {
-    SRC=${S}
-    DEST=${D}${datadir}/phosphor-led-manager
-    install -D ${SRC}/led.yaml ${DEST}/led.yaml
-}
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config/led.yaml b/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config/led.yaml
deleted file mode 100755
index 3b7d404..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config/led.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-BmcBooted:
-    heartbeat:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 0
-PowerOn:
-    power:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-EnclosureFault:
-    identify:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-EnclosureIdentify:
-    identify:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-LampTest:
-    heartbeat:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-    identify:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-    power:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native.bbappend
deleted file mode 100644
index 836ef56..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://palmetto.xml.patch.xml"
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native/palmetto.xml.patch.xml b/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native/palmetto.xml.patch.xml
deleted file mode 100644
index 7329377..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native/palmetto.xml.patch.xml
+++ /dev/null
@@ -1,473 +0,0 @@
-<patches>
-
-<targetFile>palmetto.xml</targetFile>
-
-<!-- Add in the 5 fan and connector instances -->
-<targetInstance xpath="/">
-	<id>fanconn-0</id>
-	<type>connector-card-generic</type>
-	<library_target>false</library_target>
-	<instance_name>fanconn</instance_name>
-	<position>0</position>
-	<child_id>fan-0</child_id>
-	<attribute>
-		<id>CLASS</id>
-		<default>CONNECTOR</default>
-	</attribute>
-	<attribute>
-		<id>LOCATION_CODE</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MODEL</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MRW_TYPE</id>
-		<default>NA</default>
-	</attribute>
-	<attribute>
-		<id>POSITION</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>RESOURCE_IS_CRITICAL</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>TYPE</id>
-		<default>NA</default>
-	</attribute>
-</targetInstance>
-<targetInstance xpath="/">
-	<id>fan-0</id>
-	<type>card-fan</type>
-	<library_target>false</library_target>
-	<instance_name>fan</instance_name>
-	<position>0</position>
-	<attribute>
-		<id>CLASS</id>
-		<default>CARD</default>
-	</attribute>
-	<attribute>
-		<id>FRU_ID</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>FRU_NAME</id>
-		<default>FAN</default>
-	</attribute>
-	<attribute>
-		<id>LOCATION_CODE</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MODEL</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MRW_TYPE</id>
-		<default>NA</default>
-	</attribute>
-	<attribute>
-		<id>POSITION</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>RESOURCE_IS_CRITICAL</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>TYPE</id>
-		<default>FAN</default>
-	</attribute>
-</targetInstance>
-<targetInstance xpath="/">
-	<id>fanconn-1</id>
-	<type>connector-card-generic</type>
-	<library_target>false</library_target>
-	<instance_name>fanconn</instance_name>
-	<position>1</position>
-	<child_id>fan-1</child_id>
-	<attribute>
-		<id>CLASS</id>
-		<default>CONNECTOR</default>
-	</attribute>
-	<attribute>
-		<id>LOCATION_CODE</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MODEL</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MRW_TYPE</id>
-		<default>NA</default>
-	</attribute>
-	<attribute>
-		<id>POSITION</id>
-		<default>1</default>
-	</attribute>
-	<attribute>
-		<id>RESOURCE_IS_CRITICAL</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>TYPE</id>
-		<default>NA</default>
-	</attribute>
-</targetInstance>
-<targetInstance xpath="/">
-	<id>fan-1</id>
-	<type>card-fan</type>
-	<library_target>false</library_target>
-	<instance_name>fan</instance_name>
-	<position>1</position>
-	<attribute>
-		<id>CLASS</id>
-		<default>CARD</default>
-	</attribute>
-	<attribute>
-		<id>FRU_ID</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>FRU_NAME</id>
-		<default>FAN</default>
-	</attribute>
-	<attribute>
-		<id>LOCATION_CODE</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MODEL</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MRW_TYPE</id>
-		<default>NA</default>
-	</attribute>
-	<attribute>
-		<id>POSITION</id>
-		<default>1</default>
-	</attribute>
-	<attribute>
-		<id>RESOURCE_IS_CRITICAL</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>TYPE</id>
-		<default>FAN</default>
-	</attribute>
-</targetInstance>
-<targetInstance xpath="/">
-	<id>fanconn-2</id>
-	<type>connector-card-generic</type>
-	<library_target>false</library_target>
-	<instance_name>fanconn</instance_name>
-	<position>2</position>
-	<child_id>fan-2</child_id>
-	<attribute>
-		<id>CLASS</id>
-		<default>CONNECTOR</default>
-	</attribute>
-	<attribute>
-		<id>LOCATION_CODE</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MODEL</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MRW_TYPE</id>
-		<default>NA</default>
-	</attribute>
-	<attribute>
-		<id>POSITION</id>
-		<default>2</default>
-	</attribute>
-	<attribute>
-		<id>RESOURCE_IS_CRITICAL</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>TYPE</id>
-		<default>NA</default>
-	</attribute>
-</targetInstance>
-<targetInstance xpath="/">
-	<id>fan-2</id>
-	<type>card-fan</type>
-	<library_target>false</library_target>
-	<instance_name>fan</instance_name>
-	<position>2</position>
-	<attribute>
-		<id>CLASS</id>
-		<default>CARD</default>
-	</attribute>
-	<attribute>
-		<id>FRU_ID</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>FRU_NAME</id>
-		<default>FAN</default>
-	</attribute>
-	<attribute>
-		<id>LOCATION_CODE</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MODEL</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MRW_TYPE</id>
-		<default>NA</default>
-	</attribute>
-	<attribute>
-		<id>POSITION</id>
-		<default>2</default>
-	</attribute>
-	<attribute>
-		<id>RESOURCE_IS_CRITICAL</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>TYPE</id>
-		<default>FAN</default>
-	</attribute>
-</targetInstance>
-<targetInstance xpath="/">
-	<id>fanconn-3</id>
-	<type>connector-card-generic</type>
-	<library_target>false</library_target>
-	<instance_name>fanconn</instance_name>
-	<position>3</position>
-	<child_id>fan-3</child_id>
-	<attribute>
-		<id>CLASS</id>
-		<default>CONNECTOR</default>
-	</attribute>
-	<attribute>
-		<id>LOCATION_CODE</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MODEL</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MRW_TYPE</id>
-		<default>NA</default>
-	</attribute>
-	<attribute>
-		<id>POSITION</id>
-		<default>3</default>
-	</attribute>
-	<attribute>
-		<id>RESOURCE_IS_CRITICAL</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>TYPE</id>
-		<default>NA</default>
-	</attribute>
-</targetInstance>
-<targetInstance xpath="/">
-	<id>fan-3</id>
-	<type>card-fan</type>
-	<library_target>false</library_target>
-	<instance_name>fan</instance_name>
-	<position>3</position>
-	<attribute>
-		<id>CLASS</id>
-		<default>CARD</default>
-	</attribute>
-	<attribute>
-		<id>FRU_ID</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>FRU_NAME</id>
-		<default>FAN</default>
-	</attribute>
-	<attribute>
-		<id>LOCATION_CODE</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MODEL</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MRW_TYPE</id>
-		<default>NA</default>
-	</attribute>
-	<attribute>
-		<id>POSITION</id>
-		<default>3</default>
-	</attribute>
-	<attribute>
-		<id>RESOURCE_IS_CRITICAL</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>TYPE</id>
-		<default>FAN</default>
-	</attribute>
-</targetInstance>
-<targetInstance xpath="/">
-	<id>fanconn-4</id>
-	<type>connector-card-generic</type>
-	<library_target>false</library_target>
-	<instance_name>fanconn</instance_name>
-	<position>4</position>
-	<child_id>fan-4</child_id>
-	<attribute>
-		<id>CLASS</id>
-		<default>CONNECTOR</default>
-	</attribute>
-	<attribute>
-		<id>LOCATION_CODE</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MODEL</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MRW_TYPE</id>
-		<default>NA</default>
-	</attribute>
-	<attribute>
-		<id>POSITION</id>
-		<default>4</default>
-	</attribute>
-	<attribute>
-		<id>RESOURCE_IS_CRITICAL</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>TYPE</id>
-		<default>NA</default>
-	</attribute>
-</targetInstance>
-<targetInstance xpath="/">
-	<id>fan-4</id>
-	<type>card-fan</type>
-	<library_target>false</library_target>
-	<instance_name>fan</instance_name>
-	<position>4</position>
-	<attribute>
-		<id>CLASS</id>
-		<default>CARD</default>
-	</attribute>
-	<attribute>
-		<id>FRU_ID</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>FRU_NAME</id>
-		<default>FAN</default>
-	</attribute>
-	<attribute>
-		<id>LOCATION_CODE</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MODEL</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>MRW_TYPE</id>
-		<default>NA</default>
-	</attribute>
-	<attribute>
-		<id>POSITION</id>
-		<default>4</default>
-	</attribute>
-	<attribute>
-		<id>RESOURCE_IS_CRITICAL</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>TYPE</id>
-		<default>FAN</default>
-	</attribute>
-</targetInstance>
-
-<!-- place the fan connectors on the motherboard -->
-<targetInstance type="add-child" xpath="targetInstance[id='motherboard-0']">
-	<child_id>fanconn-0</child_id>
-	<child_id>fanconn-1</child_id>
-	<child_id>fanconn-2</child_id>
-	<child_id>fanconn-3</child_id>
-	<child_id>fanconn-4</child_id>
-</targetInstance>
-
-<!-- Add in the motherboard FRU name -->
-<attribute type="add" xpath="targetInstance[id='motherboard-0']">
-    <id>FRU_NAME</id>
-    <default>MOTHERBOARD</default>
-</attribute>
-
-<!-- add in some new types -->
-<enumerationType type="add-child" xpath="enumerationType[id='TYPE']">
-    <enumerator>
-        <name>FAN</name>
-        <value>35</value>
-    </enumerator>
-    <enumerator>
-        <name>PCIE_CARD</name>
-        <value>36</value>
-    </enumerator>
-</enumerationType>
-
-
-
-<!--fix up the other enums that come at the end of the list-->
-<enumerationType type="replace-child" key="name" xpath="enumerationType[id='TYPE']">
-    <enumerator>
-        <name>TEST_FAIL</name>
-        <value>37</value>
-    </enumerator>
-    <enumerator>
-        <name>LAST_IN_RANGE</name>
-        <value>38</value>
-    </enumerator>
-</enumerationType>
-
-<!-- Fix the PCIE card's type -->
-<attribute type="replace" xpath="targetInstance[id='pciecard_x8-0']/attribute[id='TYPE']">
-    <id>TYPE</id>
-    <default>PCIE_CARD</default>
-</attribute>
-
-<!-- Add the card's FRU name -->
-<attribute type="add" xpath="targetInstance[id='pciecard_x8-0']">
-    <id>FRU_NAME</id>
-    <default>PCIE_CARD</default>
-</attribute>
-
-<!-- Fix the PCIE card's type -->
-<attribute type="replace" xpath="targetInstance[id='pciecard_x16-0']/attribute[id='TYPE']">
-    <id>TYPE</id>
-    <default>PCIE_CARD</default>
-</attribute>
-
-<!-- Add the card's FRU name -->
-<attribute type="add" xpath="targetInstance[id='pciecard_x16-0']">
-    <id>FRU_NAME</id>
-    <default>PCIE_CARD</default>
-</attribute>
-
-<!-- new parser requires FABRIC_GROUP_ID, though it's unused by the BMC -->
-<attribute type="replace" xpath="targetInstance[id='proc_socket-0']/attribute[id='FABRIC_NODE_ID']">
-    <id>FABRIC_GROUP_ID</id>
-    <default>0</default>
-</attribute>
-
-</patches>
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
deleted file mode 100644
index e5b837a..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-RDEPENDS_${PN}-inventory += "openpower-occ-control"
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend
deleted file mode 100644
index c0b52cf..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-RDEPENDS_${PN}-chassis_remove += "obmc-button-reset"
-RDEPENDS_${PN}-fans_remove += "obmc-control-fan"
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
deleted file mode 100644
index e904dc0..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-NAMES = " \
-        i2c@1e78a000/i2c-bus@40/rtc@68 \
-        i2c@1e78a000/i2c-bus@c0/tmp423@4c \
-        i2c@1e78a000/i2c-bus@100/occ-hwmon@50 \
-        "
-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-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/occ-hwmon@50.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/occ-hwmon@50.conf
deleted file mode 100644
index 40c4d78..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/occ-hwmon@50.conf
+++ /dev/null
@@ -1,40 +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"
-LABEL_temp13 = "cpu0"
-LABEL_temp101 = "centaur0"
-LABEL_temp102 = "dimm0"
-LABEL_temp103 = "dimm1"
-LABEL_temp104 = "dimm2"
-LABEL_temp105 = "dimm3"
-LABEL_temp106 = "core0"
-LABEL_temp107 = "core1"
-LABEL_temp108 = "core2"
-LABEL_temp109 = "core3"
-LABEL_temp110 = "core4"
-LABEL_temp111 = "core5"
-LABEL_temp112 = "core6"
-LABEL_temp113 = "core7"
-LABEL_temp114 = "core8"
-LABEL_temp115 = "core9"
-LABEL_temp116 = "core10"
-LABEL_temp117 = "core11"
-LABEL_power1 = "cpu0"
-LABEL_power2 = "pcie"
-LABEL_power3 = "io"
-LABEL_power4 = "centaur0"
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/rtc@68.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/rtc@68.conf
deleted file mode 100644
index 8b6053e..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/rtc@68.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=rtc
-WARNLO_temp1=10000
-WARNHI_temp1=35000
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@c0/tmp423@4c.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@c0/tmp423@4c.conf
deleted file mode 100644
index 3166f32..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@c0/tmp423@4c.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LABEL_temp1=ambient
-WARNLO_temp1=10000
-WARNHI_temp1=40000
-
-LABEL_temp2=cpu
-WARNLO_temp2=10000
-WARNHI_temp2=80000
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb b/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb
deleted file mode 100644
index 97d12de..0000000
--- a/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-SUMMARY = "Palmetto board wiring"
-DESCRIPTION = "Board wiring information for the Palmetto system."
-PR = "r1"
-
-inherit config-in-skeleton
-
-PROVIDES_remove = "virtual/obmc-inventory-data"
-RPROVIDES_${PN}_remove = "virtual-obmc-inventory-data"
diff --git a/meta-ibm/meta-palmetto/recipes.txt b/meta-ibm/meta-palmetto/recipes.txt
deleted file mode 100644
index db84c6f..0000000
--- a/meta-ibm/meta-palmetto/recipes.txt
+++ /dev/null
@@ -1 +0,0 @@
-recipes-kernel       - The kernel and generic applications/libraries with strong kernel dependencies
diff --git a/meta-ibm/meta-romulus/conf/bblayers.conf.sample b/meta-ibm/meta-romulus/conf/bblayers.conf.sample
deleted file mode 100644
index 52ee80d..0000000
--- a/meta-ibm/meta-romulus/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,35 +0,0 @@
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-LCONF_VERSION = "7"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus \
-  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus \
-  "
diff --git a/meta-ibm/meta-romulus/conf/conf-notes.txt b/meta-ibm/meta-romulus/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a..0000000
--- a/meta-ibm/meta-romulus/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf
deleted file mode 100644
index 3a29f43..0000000
--- a/meta-ibm/meta-romulus/conf/layer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-            ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "romulus"
-BBFILE_PATTERN_romulus = ""
-LAYERSERIES_COMPAT_romulus = "sumo"
diff --git a/meta-ibm/meta-romulus/conf/local.conf.sample b/meta-ibm/meta-romulus/conf/local.conf.sample
deleted file mode 100644
index b2b739f..0000000
--- a/meta-ibm/meta-romulus/conf/local.conf.sample
+++ /dev/null
@@ -1,223 +0,0 @@
-#
-# This file is your local configuration file and is where all local user settings
-# are placed. The comments in this file give some guide to the options a new user
-# to the system might want to change but pretty much any configuration option can
-# be set in this file.
-#
-# Lines starting with the '#' character are commented out and in some cases the
-# default values are provided as comments to show people example syntax. Enabling
-# the option is a question of removing the # character and making any change to the
-# variable as required.
-
-#
-# Machine Selection
-#
-MACHINE ??= "romulus"
-
-#
-# 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 ?= " *"
-
-#
-# Extra image configuration defaults
-#
-# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated
-# images. Some of these options are added to certain image types automatically. The
-# variable can contain the following options:
-#  "dbg-pkgs"       - add -dbg packages for all installed packages
-#                     (adds symbol information for debugging/profiling)
-#  "dev-pkgs"       - add -dev packages for all installed packages
-#                     (useful if you want to develop against libs in the image)
-#  "ptest-pkgs"     - add -ptest packages for all ptest-enabled packages
-#                     (useful if you want to run the package test suites)
-#  "tools-sdk"      - add development tools (gcc, make, pkgconfig etc.)
-#  "tools-debug"    - add debugging tools (gdb, strace)
-#  "eclipse-debug"  - add Eclipse remote debugging support
-#  "tools-profile"  - add profiling tools (oprofile, exmap, lttng, valgrind)
-#  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
-#  "debug-tweaks"   - make an image suitable for development
-#                     e.g. ssh root access has a blank password
-# There are other application targets that can be used here too, see
-# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
-# We default to enabling the debugging tweaks.
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-
-#
-# Additional image features
-#
-# The following is a list of additional classes to use when building images which
-# enable extra features. Some available options which can be included in this variable
-# are:
-#   - 'buildstats' collect build statistics
-#   - 'image-mklibs' to reduce shared library files size for an image
-#   - 'image-prelink' in order to prelink the filesystem image
-#   - 'image-swab' to perform host system intrusion detection
-# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
-# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-
-#
-# Runtime testing of images
-#
-# The build system can test booting virtual machine images under qemu (an emulator)
-# after any root filesystems are created and run tests against those images. To
-# enable this uncomment this line. See classes/testimage(-auto).bbclass for
-# further details.
-#TEST_IMAGE = "1"
-#
-# Interactive shell configuration
-#
-# Under certain circumstances the system may need input from you and to do this it
-# can launch an interactive shell. It needs to do this since the build is
-# multithreaded and needs to be able to handle the case where more than one parallel
-# process may require the user's attention. The default is iterate over the available
-# terminal types to find one that works.
-#
-# Examples of the occasions this may happen are when resolving patches which cannot
-# be applied, to use the devshell or the kernel menuconfig
-#
-# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
-# Note: currently, Konsole support only works for KDE 3.x due to the way
-# newer Konsole versions behave
-#OE_TERMINAL = "auto"
-# By default disable interactive patch resolution (tasks will just fail instead):
-PATCHRESOLVE = "noop"
-
-#
-# Disk Space Monitoring during the build
-#
-# Monitor the disk space during the build. If there is less that 1GB of space or less
-# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
-# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort
-# of the build. The reason for this is that running completely out of space can corrupt
-# files and damages the build in ways which may not be easily recoverable.
-# It's necessary to monitor /tmp, if there is no space left the build will fail
-# with very exotic errors.
-BB_DISKMON_DIRS = "\
-    STOPTASKS,${TMPDIR},1G,100K \
-    STOPTASKS,${DL_DIR},1G,100K \
-    STOPTASKS,${SSTATE_DIR},1G,100K \
-    STOPTASKS,/tmp,100M,100K \
-    ABORT,${TMPDIR},100M,1K \
-    ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K \
-    ABORT,/tmp,10M,1K"
-
-#
-# Shared-state files from other locations
-#
-# As mentioned above, shared state files are prebuilt cache data objects which can
-# used to accelerate build time. This variable can be used to configure the system
-# to search other mirror locations for these objects before it builds the data itself.
-#
-# This can be a filesystem directory, or a remote url such as http or ftp. These
-# would contain the sstate-cache results from previous builds (possibly from other
-# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the
-# cache locations to check for the shared objects.
-# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH
-# at the end as shown in the examples below. This will be substituted with the
-# correct path within the directory structure.
-#SSTATE_MIRRORS ?= "\
-#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
-#file://.* file:///some/local/dir/sstate/PATH"
-
-
-#
-# Qemu configuration
-#
-# By default qemu will build with a builtin VNC server where graphical output can be
-# seen. The two lines below enable the SDL backend too. This assumes there is a
-# libsdl library available on your build system.
-#PACKAGECONFIG_append_pn-qemu-native = " sdl"
-#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
-#ASSUME_PROVIDED += "libsdl-native"
-
-
-# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
-# track the version of this file when it was generated. This can safely be ignored if
-# this doesn't mean anything to you.
-CONF_VERSION = "1"
-
-# Set the root password to '0penBmc'
-INHERIT += "extrausers"
-
-EXTRA_USERS_PARAMS = " \
-  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
-  "
diff --git a/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-ibm/meta-romulus/conf/machine/romulus.conf
deleted file mode 100644
index 14778f6..0000000
--- a/meta-ibm/meta-romulus/conf/machine/romulus.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
-
-UBOOT_MACHINE = "ast_g5_ncsi_config"
-
-PREFERRED_PROVIDER_virtual/p9-vcs-workaround = ''
-
-require conf/machine/include/ast2500.inc
-require conf/machine/include/obmc-bsp-common.inc
-require conf/machine/include/ibm.inc
-require conf/machine/include/p9.inc
-
-PHOSPHOR_MRW_URI = "git://github.com/open-power/romulus-xml"
-PHOSPHOR_MRW_REV = "14b471fbf37f5fb60261de001df83caf5f96d81f"
-
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "romulus-ipmi-inventory-map-native"
-PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "romulus-led-manager-config-native"
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory = "romulus-ipmi-fru-read-inventory-native"
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-inventory-sel = "romulus-ipmi-inventory-sel-native"
-PREFERRED_PROVIDER_virtual/phosphor-logging-callouts = "romulus-phosphor-logging-callouts-native"
diff --git a/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed/romulus.cfg b/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed/romulus.cfg
deleted file mode 100644
index 9f8fdb9..0000000
--- a/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed/romulus.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_SENSORS_TMP421=y
-CONFIG_SENSORS_MAX31785=y
-CONFIG_RTC_DRV_RV8803=y
-CONFIG_SENSORS_W83773G=y
diff --git a/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend
deleted file mode 100644
index fd0a149..0000000
--- a/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
-SRC_URI += "file://romulus.cfg"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb
deleted file mode 100644
index e014da2..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SUMMARY = "Romulus AVSBus control"
-PR = "r1"
-
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
-
-RDEPENDS_${PN} += "i2c-tools bash"
-
-S = "${WORKDIR}"
-SRC_URI += "file://avsbus-workaround.sh \
-            file://avsbus-enable.sh \
-            file://avsbus-disable.sh"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/avsbus-workaround.sh \
-            ${D}${bindir}/avsbus-workaround.sh
-        install -m 0755 ${WORKDIR}/avsbus-disable.sh \
-            ${D}${bindir}/avsbus-disable.sh
-        install -m 0755 ${WORKDIR}/avsbus-enable.sh \
-            ${D}${bindir}/avsbus-enable.sh
-}
-
-TMPL_EN= "avsbus-enable@.service"
-TMPL_DIS= "avsbus-disable@.service"
-TMPL_WA= "avsbus-workaround@.service"
-INSTFMT_EN= "avsbus-enable@{0}.service"
-INSTFMT_DIS= "avsbus-disable@{0}.service"
-INSTFMT_WA= "avsbus-workaround@{0}.service"
-TGTFMT = "obmc-chassis-poweron@{0}.target"
-FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}"
-FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}"
-FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL_EN}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "${TMPL_DIS}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "${TMPL_WA}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable.sh b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable.sh
deleted file mode 100644
index 1c36000..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-i2cset -y 4 0x70 0x00 0x00 b    # VDD 0  - PAGE set
-i2cset -y 4 0x70 0x01 0x80 b    # VDD 0
-i2cset -y 4 0x70 0x00 0x01 b    # VCS 0  - PAGE set
-i2cset -y 4 0x70 0x01 0x80 b    # VCS 0
-i2cset -y 4 0x70 0x00 0x00 b    # VCS 0  - PAGE reset
-i2cset -y 4 0x73 0x00 0x00 b    # VDN 0  - PAGE set
-i2cset -y 4 0x73 0x01 0x80 b    # VDN 0
-i2cset -y 5 0x70 0x00 0x00 b    # VDD 1  - PAGE set
-i2cset -y 5 0x70 0x01 0x80 b    # VDD 1
-i2cset -y 5 0x70 0x00 0x01 b    # VCS 1  - PAGE set
-i2cset -y 5 0x70 0x01 0x80 b    # VCS 1
-i2cset -y 5 0x70 0x00 0x00 b    # VCS 1  - PAGE reset
-i2cset -y 5 0x73 0x00 0x00 b    # VDN 1  - PAGE set
-i2cset -y 5 0x73 0x01 0x80 b    # VDN 1
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
deleted file mode 100644
index 424aa23..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Disable the AVS bus on the VRMs
-Wants=avsbus-workaround@%i.service
-After=avsbus-workaround@%i.service
-Before=vrm-control@%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env avsbus-disable.sh
-SyslogIdentifier=avsbus-disable.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable.sh b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable.sh
deleted file mode 100644
index 98e585c..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-i2cset -y 4 0x70 0x00 0x00 b    # VDD 0  - PAGE set
-i2cset -y 4 0x70 0x01 0xB0 b    # VDD 0
-i2cset -y 4 0x70 0x00 0x01 b    # VCS 0  - PAGE set
-i2cset -y 4 0x70 0x01 0xB0 b    # VCS 0
-i2cset -y 4 0x70 0x00 0x00 b    # VCS 0  - PAGE reset
-i2cset -y 4 0x73 0x00 0x00 b    # VDN 0  - PAGE set
-i2cset -y 4 0x73 0x01 0xB0 b    # VDN 0
-i2cset -y 5 0x70 0x00 0x00 b    # VDD 1  - PAGE set
-i2cset -y 5 0x70 0x01 0xB0 b    # VDD 1
-i2cset -y 5 0x70 0x00 0x01 b    # VCS 1  - PAGE set
-i2cset -y 5 0x70 0x01 0xB0 b    # VCS 1
-i2cset -y 5 0x70 0x00 0x00 b    # VCS 1  - PAGE reset
-i2cset -y 5 0x73 0x00 0x00 b    # VDN 1  - PAGE set
-i2cset -y 5 0x73 0x01 0xB0 b    # VDN 1
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
deleted file mode 100644
index b7fb41e..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Enable the AVS bus on VRMs
-Wants=vrm-control@%i.service
-After=vrm-control@%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env avsbus-enable.sh
-SyslogIdentifier=avsbus-enable.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround.sh b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround.sh
deleted file mode 100644
index 75ec8ca..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-i2cset -y 4 0x28 0x2E 0x23 b # VDD/VCS 0
-i2cset -y 4 0x2B 0x2E 0x23 b # VDN 0
-i2cset -y 5 0x28 0x2E 0x23 b # VDD/VCS 1
-i2cset -y 5 0x2B 0x2E 0x23 b # VDN 1
-
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
deleted file mode 100644
index 156ef03..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Perform AVS bus workaround on VRMs
-Wants=op-power-start@.service
-After=op-power-start@.service
-Before=avsbus-disable@%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env avsbus-workaround.sh
-SyslogIdentifier=avsbus-workaround.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb
deleted file mode 100644
index e23bdd0..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Romulus VRM Overrides"
-DESCRIPTION = "Sets Rolumus VRMs to custom voltages"
-PR = "r1"
-
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
-
-RDEPENDS_${PN} += "i2c-tools bash"
-
-S = "${WORKDIR}"
-SRC_URI += "file://vrm-control.sh \
-            file://vrm.sh"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/vrm.sh ${D}${bindir}/vrm.sh
-        install -m 0755 ${WORKDIR}/vrm-control.sh ${D}${bindir}/vrm-control.sh
-}
-
-TMPL = "vrm-control@.service"
-INSTFMT = "vrm-control@{0}.service"
-TGTFMT = "obmc-chassis-poweron@{0}.target"
-FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control.sh b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control.sh
deleted file mode 100644
index 8701242..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control.sh
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/bash
-# #########################################################
-# Script to run on Romulus BMC to read/set vrm voltages
-
-
-# #########################################################
-d2v () {
-# usage:   d2v <decimal volts>
-
-echo $1 | awk '{print $1 * 256 + .5}' | cut -d '.' -f 1
-}
-
-
-# #########################################################
-v2d () {
-# usage:   v2d <hex val>
-
-printf "	%0.3fV" `echo $1 | awk '{print $1 / 256}'`
-}
-
-
-# #########################################################
-i2d () {
-# usage:  i2d <hex val> <current divisor>
-
-# parse current mantisa and exponent
-# format: SEEE ESMM MMMM MMMM
-let e=$1/0x800
-let esign=e/0x10
-let m=$1\&0x07FF
-let msign=m/0x0400
-
-if [ $msign -eq 1 ]
-then
-  # calc ones compliment
-  let m=($m^0x07FF)+1
-  m="-$m"
-fi
-if [ $esign -eq 1 ]
-then
-  # calc ones compliment
-  let e=(e^0x1F)+1
-  e="-$e"
-fi
-printf "	%0.3fA\n" `echo $m $e $2 | awk '{print ($1 * 2^$2) / $3}'`
-}
-
-
-# #########################################################
-rw_vc () {
-# usage:   rw_vc <bus> <addr> <current divisor> <channel> <value>
-
-# select channel
-if [ $4 != "x" ]
-then
-  i2cset -y $1 $2 0 $4 b
-fi
-
-# write new voltage set point
-if [ ! -e $5 ]
-then
-  i2cset -y $1 $2 0x21 `d2v $5` w
-fi
-
-# print voltage set point
-v2d `i2cget -y $1 $2 0x21 w`
-
-# print voltage
-v2d `i2cget -y $1 $2 0x8B w`
-
-# print current
-i2d `i2cget -y $1 $2 0x8C w` $3
-
-# default back to channel 0
-if [ $4 != "x" ]
-then
-  i2cset -y $1 $2 0 0 b
-fi
-}
-
-
-# #########################################################
-# Main
-
-if [ -e $1 ]
-then
-  $0 vdda vcsa vdna vioa vddb vcsb vdnb viob
-  exit
-fi
-
-if [ $1 == "-h" ]
-then
-  echo "  Usage: vrm [<rail>=[value] [<rail>=[value]] ...]"
-  echo "    rail: vdda vcsa vdna vioa vddb vcsb vdnb viob"
-  echo "    value: volts"
-  echo
-  echo "    e.g., vrm vioa=1.0 viob=1.0"
-  echo
-  exit
-fi
-
-echo "rail	set	read	current"
-echo "-------	------- ------- -------"
-for param in ${@:1}
-do
-  rail=`echo $param | cut -d'=' -f 1`
-  val=`echo ${param}= | cut -d'=' -f 2`
-  echo -n "$rail"
-  case "$rail" in
-    vdda)
-      rw_vc 4 0x70 2 0 $val
-      ;;
-    vddb)
-      rw_vc 5 0x70 2 0 $val
-      ;;
-    vcsa)
-      rw_vc 4 0x70 4 1 $val
-      ;;
-    vcsb)
-      rw_vc 5 0x70 4 1 $val
-      ;;
-    vdna)
-      rw_vc 4 0x73 2 0 $val
-      ;;
-    vdnb)
-      rw_vc 5 0x73 2 0 $val
-      ;;
-    vioa)
-      rw_vc 4 0x73 2 1 $val
-      ;;
-    viob)
-      rw_vc 5 0x73 2 1 $val
-      ;;
-    *)
-      echo "	non-existant"
-  esac
-done
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service
deleted file mode 100644
index 22f0aeb..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Apply voltage overrides to VRMs
-Wants=avsbus-disable@%i.service
-After=avsbus-disable@%i.service
-Before=avsbus-enable@%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env vrm.sh
-SyslogIdentifier=vrm.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm.sh b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm.sh
deleted file mode 100644
index 725e72f..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-vrm-control.sh vdna=0.9 vdnb=0.9
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-ibm/meta-romulus/recipes-phosphor/console/obmc-console/obmc-console.conf
deleted file mode 100644
index a5ba3f3..0000000
--- a/meta-ibm/meta-romulus/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-ibm/meta-romulus/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/console/obmc-console_%.bbappend
deleted file mode 100644
index 4db6f3a..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/console/obmc-console_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
deleted file mode 100644
index ddf1556..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
+++ /dev/null
@@ -1,423 +0,0 @@
-groups:
-    - name: air_cooled_zone0_fans
-      description: Group of fan inventory objects for air cooled zone 0
-      type: /xyz/openbmc_project/inventory
-      members:
-          - /system/chassis/motherboard/fan0
-          - /system/chassis/motherboard/fan1
-          - /system/chassis/motherboard/fan2
-    - name: zone0_ambient
-      description: Group of ambient temperature sensors for zone 0
-      type: /xyz/openbmc_project/sensors
-      members:
-          - /temperature/outlet
-    - name: occ0_object
-      description: Dbus object containing OCC0 properties
-      type: /org/open_power/control
-      members:
-          - /occ0
-    - name: occ1_object
-      description: Dbus object containing OCC1 properties
-      type: /org/open_power/control
-      members:
-          - /occ1
-    - name: zone0_cores
-      description: Group of core temperature sensors for zone 0
-      type: /xyz/openbmc_project/sensors
-      members:
-          - /temperature/p0_core0_temp
-          - /temperature/p0_core1_temp
-          - /temperature/p0_core2_temp
-          - /temperature/p0_core3_temp
-          - /temperature/p0_core4_temp
-          - /temperature/p0_core5_temp
-          - /temperature/p0_core6_temp
-          - /temperature/p0_core7_temp
-          - /temperature/p0_core8_temp
-          - /temperature/p0_core9_temp
-          - /temperature/p0_core10_temp
-          - /temperature/p0_core11_temp
-          - /temperature/p0_core12_temp
-          - /temperature/p0_core13_temp
-          - /temperature/p0_core14_temp
-          - /temperature/p0_core15_temp
-          - /temperature/p0_core16_temp
-          - /temperature/p0_core17_temp
-          - /temperature/p0_core18_temp
-          - /temperature/p0_core19_temp
-          - /temperature/p0_core20_temp
-          - /temperature/p0_core21_temp
-          - /temperature/p0_core22_temp
-          - /temperature/p0_core23_temp
-          - /temperature/p1_core0_temp
-          - /temperature/p1_core1_temp
-          - /temperature/p1_core2_temp
-          - /temperature/p1_core3_temp
-          - /temperature/p1_core4_temp
-          - /temperature/p1_core5_temp
-          - /temperature/p1_core6_temp
-          - /temperature/p1_core7_temp
-          - /temperature/p1_core8_temp
-          - /temperature/p1_core9_temp
-          - /temperature/p1_core10_temp
-          - /temperature/p1_core11_temp
-          - /temperature/p1_core12_temp
-          - /temperature/p1_core13_temp
-          - /temperature/p1_core14_temp
-          - /temperature/p1_core15_temp
-          - /temperature/p1_core16_temp
-          - /temperature/p1_core17_temp
-          - /temperature/p1_core18_temp
-          - /temperature/p1_core19_temp
-          - /temperature/p1_core20_temp
-          - /temperature/p1_core21_temp
-          - /temperature/p1_core22_temp
-          - /temperature/p1_core23_temp
-    - name: zone0_dimms
-      description: Group of dimm temperature sensors for zone 0
-      type: /xyz/openbmc_project/sensors
-      members:
-          - /temperature/dimm0_temp
-          - /temperature/dimm1_temp
-          - /temperature/dimm2_temp
-          - /temperature/dimm3_temp
-          - /temperature/dimm4_temp
-          - /temperature/dimm5_temp
-          - /temperature/dimm6_temp
-          - /temperature/dimm7_temp
-          - /temperature/dimm8_temp
-          - /temperature/dimm9_temp
-          - /temperature/dimm10_temp
-          - /temperature/dimm11_temp
-          - /temperature/dimm12_temp
-          - /temperature/dimm13_temp
-          - /temperature/dimm14_temp
-          - /temperature/dimm15_temp
-
-matches:
-    - name: propertiesChanged
-      description: >
-          A property changed match
-      parameters:
-          - object
-          - interface
-      signal: propertySignal
-    - name: interfacesAdded
-      description: >
-          An interfaces added match
-      parameters:
-          - object
-      signal: objectSignal
-    - name: nameOwnerChanged
-      description: >
-          A name owner changed match
-      parameters:
-          - object
-          - interface
-      signal: ownerSignal
-
-signals:
-    - name: propertySignal
-      description: >
-          Handle property signals
-      parameters:
-          - type
-          - object
-          - interface
-          - property
-      handler: setProperty
-    - name: objectSignal
-      description: >
-          Handle object signals
-      parameters:
-          - type
-          - object
-          - interface
-          - property
-      handler: setProperty
-    - name: ownerSignal
-      description: >
-          Handle owner signals
-      parameters:
-          - object
-          - interface
-      handler: setService
-
-handlers:
-    - name: setProperty
-      description: >
-          Sets a value for the given object/interface/property
-      parameters:
-          - type
-          - object
-          - interface
-          - property
-    - name: setService
-      description: >
-          Sets the service name(s) for the given group
-      parameters:
-          - group
-
-preconditions:
-    - name: property_states_match
-      description: >
-          All defined properties must match the values given to
-          enable a set speed event otherwise fan speeds are set to full
-      parameters:
-          - groups
-
-actions:
-    - name: call_actions_based_on_timer
-      description: >
-          Sets up a list of actions to be invoked when the defined timer
-          expires (or for each expiration of a repeating timer)
-      parameters:
-          - timer
-          - actions
-    - name: default_floor_on_missing_owner
-      description: >
-          Set the fan floor to the default floor
-    - name: set_speed_on_missing_owner
-      description: >
-          Set fans to the given speed when any service within the group
-          no longer exists
-      parameters:
-          - speed
-    - name: set_request_speed_base_with_max
-      description: >
-          Set the base request speed of a zone to the max value of a group for
-          calculating a new target speed
-    - name: count_state_before_speed
-      description: Set the speed when a number of properties at a state
-      parameters:
-          - count
-          - property
-          - speed
-    - name: set_floor_from_average_sensor_value
-      description: Set floor speed from first entry with average less than key
-      parameters:
-          - map
-    - name: set_ceiling_from_average_sensor_value
-      description: Set ceiling speed based on key transition values with average
-      parameters:
-          - map
-    - name: set_net_increase_speed
-      description: >
-          Set the speed increase delta based on a factor applied to
-          the delta increase size times the given value and property's
-          value difference
-      parameters:
-          - property
-          - factor
-          - delta
-    - name: set_net_decrease_speed
-      description: >
-          Set the speed decrease delta based on a factor applied to
-          the delta decrease size times the given value and property's
-          value difference
-      parameters:
-          - property
-          - factor
-          - delta
-
-events:
-    - name: default_fan_floor_on_service_fail
-      groups:
-          - name: zone0_ambient
-            interface: xyz.openbmc_project.Sensor.Value
-            property:
-                name: Value
-                type: int64_t
-      matches:
-          - name: nameOwnerChanged
-      actions:
-          - name: call_actions_based_on_timer
-            timer:
-                delay: 5
-                type: oneshot
-            actions:
-                - name: default_floor_on_missing_owner
-    - name: high_speed_on_occ0_service_fail
-      groups:
-          - name: occ0_object
-            interface: org.open_power.OCC.Status
-            property:
-                name: OccActive
-                type: bool
-      matches:
-          - name: nameOwnerChanged
-      actions:
-          - name: call_actions_based_on_timer
-            timer:
-                delay: 5
-                type: oneshot
-            actions:
-                - name: set_speed_on_missing_owner
-                  speed:
-                      value: 255
-                      type: uint64_t
-    - name: high_speed_on_occ1_service_fail
-      groups:
-          - name: occ1_object
-            interface: org.open_power.OCC.Status
-            property:
-                name: OccActive
-                type: bool
-      matches:
-          - name: nameOwnerChanged
-      actions:
-          - name: call_actions_based_on_timer
-            timer:
-                delay: 5
-                type: oneshot
-            actions:
-                - name: set_speed_on_missing_owner
-                  speed:
-                      value: 255
-                      type: uint64_t
-    - name: missing_before_high_speed_air
-      groups:
-          - name: air_cooled_zone0_fans
-            interface: xyz.openbmc_project.Inventory.Item
-            property:
-                name: Present
-                type: bool
-      matches:
-          - name: propertiesChanged
-      actions:
-          - name: count_state_before_speed
-            count: 1
-            property:
-                value: false
-                type: bool
-            speed:
-                value: 255
-                type: uint64_t
-    - name: fails_before_high_speed_air
-      groups:
-          - name: air_cooled_zone0_fans
-            interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-            property:
-                name: Functional
-                type: bool
-      matches:
-          - name: propertiesChanged
-      actions:
-          - name: count_state_before_speed
-            count: 1
-            property:
-                value: false
-                type: bool
-            speed:
-                value: 255
-                type: uint64_t
-    - name: set_air_cooled_speed_boundaries_based_on_ambient
-      groups:
-          - name: zone0_ambient
-            interface: xyz.openbmc_project.Sensor.Value
-            property:
-                name: Value
-                type: int64_t
-      matches:
-          - name: propertiesChanged
-      actions:
-          - name: set_floor_from_average_sensor_value
-            map:
-                value:
-                    - 27000: 85
-                    - 32000: 112
-                    - 37000: 126
-                    - 40000: 141
-                type: std::map<int64_t, uint64_t>
-          - name: set_ceiling_from_average_sensor_value
-            map:
-                value:
-                    - 25000: 175
-                    - 27000: 255
-                type: std::map<int64_t, uint64_t>
-    - name: occ_active_speed_changes
-      precondition:
-          name: property_states_match
-          groups:
-              - name: occ0_object
-                interface: org.open_power.OCC.Status
-                property:
-                    name: OccActive
-                    type: bool
-                    value: true
-              - name: occ1_object
-                interface: org.open_power.OCC.Status
-                property:
-                    name: OccActive
-                    type: bool
-                    value: true
-          matches:
-              - name: interfacesAdded
-              - name: propertiesChanged
-          events:
-              - name: speed_changes_based_on_core_temps
-                groups:
-                    - name: zone0_cores
-                      interface: xyz.openbmc_project.Sensor.Value
-                      property:
-                          name: Value
-                          type: int64_t
-                matches:
-                    - name: interfacesAdded
-                    - name: propertiesChanged
-                actions:
-                    - name: set_net_increase_speed
-                      property:
-                          value: 73000
-                          type: int64_t
-                      factor:
-                          value: 1000
-                          type: int64_t
-                      delta:
-                          value: 11
-                          type: uint64_t
-                    - name: set_net_decrease_speed
-                      property:
-                          value: 70000
-                          type: int64_t
-                      factor:
-                          value: 1000
-                          type: int64_t
-                      delta:
-                          value: 11
-                          type: uint64_t
-                timer:
-                    interval: 5
-              - name: speed_changes_based_on_dimm_temps
-                groups:
-                    - name: zone0_dimms
-                      interface: xyz.openbmc_project.Sensor.Value
-                      property:
-                          name: Value
-                          type: int64_t
-                matches:
-                    - name: interfacesAdded
-                    - name: propertiesChanged
-                actions:
-                    - name: set_net_increase_speed
-                      property:
-                          value: 64000
-                          type: int64_t
-                      factor:
-                          value: 1000
-                          type: int64_t
-                      delta:
-                          value: 6
-                          type: uint64_t
-                    - name: set_net_decrease_speed
-                      property:
-                          value: 61000
-                          type: int64_t
-                      factor:
-                          value: 1000
-                          type: int64_t
-                      delta:
-                          value: 6
-                          type: uint64_t
-                timer:
-                    interval: 5
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml
deleted file mode 100644
index f910e62..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-fans:
-  - inventory: /system/chassis/motherboard/fan0
-    cooling_zone: 0
-    sensors:
-      - fan0
-    target_interface: xyz.openbmc_project.Control.FanPwm
-  - inventory: /system/chassis/motherboard/fan1
-    cooling_zone: 0
-    sensors:
-      - fan1
-    target_interface: xyz.openbmc_project.Control.FanPwm
-  - inventory: /system/chassis/motherboard/fan2
-    cooling_zone: 0
-    sensors:
-      - fan2
-    target_interface: xyz.openbmc_project.Control.FanPwm
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native/zone_conditions.yaml b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native/zone_conditions.yaml
deleted file mode 100644
index 7dc99b6..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native/zone_conditions.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-conditions:
-  - name: air_cooled_chassis
-    type: getProperty
-    properties:
-      - property: WaterCooled
-        interface: xyz.openbmc_project.Inventory.Decorator.CoolingType
-        path: /xyz/openbmc_project/inventory/system/chassis
-        type: bool
-        value: false
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend
deleted file mode 100644
index 6d4804d..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml
deleted file mode 100644
index 91df5c2..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-manager_configuration:
-  power_on_delay: 20
-
-zone_configuration:
-
-#Air cooled zones
-- zone_conditions:
-  zones:
-    - zone: 0
-      full_speed: 255
-      default_floor: 195
-      increase_delay: 5
-      decrease_interval: 30
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
deleted file mode 100644
index 445a111..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-fans:
-  - inventory: /system/chassis/motherboard/fan0
-    allowed_out_of_range_time: 30
-    deviation: 15
-    num_sensors_nonfunc_for_fan_nonfunc: 1
-    sensors:
-      - name: fan0
-        has_target: true
-        target_interface: xyz.openbmc_project.Control.FanPwm
-        factor: 21
-        offset: 1600
-
-  - inventory: /system/chassis/motherboard/fan1
-    allowed_out_of_range_time: 30
-    deviation: 15
-    num_sensors_nonfunc_for_fan_nonfunc: 1
-    sensors:
-      - name: fan1
-        has_target: true
-        target_interface: xyz.openbmc_project.Control.FanPwm
-        factor: 21
-        offset: 1600
-
-  - inventory: /system/chassis/motherboard/fan2
-    allowed_out_of_range_time: 30
-    deviation: 15
-    num_sensors_nonfunc_for_fan_nonfunc: 1
-    sensors:
-      - name: fan2
-        has_target: true
-        target_interface: xyz.openbmc_project.Control.FanPwm
-        factor: 21
-        offset: 1600
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml
deleted file mode 100644
index 5acb91f..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-- name: fan0
-  path: /system/chassis/motherboard/fan0
-  methods:
-    - type: tach
-      sensors:
-        - fan0
-
-- name: fan1
-  path: /system/chassis/motherboard/fan1
-  methods:
-    - type: tach
-      sensors:
-        - fan1
-
-- name: fan2
-  path: /system/chassis/motherboard/fan2
-  methods:
-    - type: tach
-      sensors:
-        - fan2
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan.bbappend
deleted file mode 100644
index 86ed1d4..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan.bbappend
+++ /dev/null
@@ -1,22 +0,0 @@
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-
-# Package configuration
-FAN_PACKAGES += " \
-        phosphor-cooling-type \
-"
-
-PACKAGECONFIG += "cooling-type"
-
-TMPL_COOLING = "phosphor-cooling-type@.service"
-INSTFMT_COOLING = "phosphor-cooling-type@{0}.service"
-COOLING_TGT = "${SYSTEMD_DEFAULT_TARGET}"
-FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}"
-
-FILES_phosphor-cooling-type = "${sbindir}/phosphor-cooling-type"
-SYSTEMD_SERVICE_phosphor-cooling-type += "${TMPL_COOLING}"
-SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}"
-
-COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf"
-
-SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type += "${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}"
-
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf
deleted file mode 100644
index 21fcfcb..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-OBJPATH="--path=/system/chassis"
-AIR="--air"
-
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service
deleted file mode 100644
index 7452b91..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Phosphor Cooling Type
-Wants=mapper-wait@-xyz-openbmc_project-inventory.service
-After=mapper-wait@-xyz-openbmc_project-inventory.service
-ConditionPathExists={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf
-
-[Service]
-EnvironmentFile={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf
-ExecStart=/usr/bin/env phosphor-cooling-type ${{OBJPATH}} ${{AIR}}
-SyslogIdentifier=phosphor-cooling-type
-
-[Install]
-RequiredBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/flash/phosphor-software-manager.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/flash/phosphor-software-manager.bbappend
deleted file mode 100644
index c92b1a8..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/flash/phosphor-software-manager.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG_append = " verify_signature"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb
deleted file mode 100644
index 7267ee3..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "Romulus ID Button pressed application"
-PR = "r1"
-
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
-
-DEPENDS += "virtual/obmc-gpio-monitor"
-RDEPENDS_${PN} += "virtual/obmc-gpio-monitor"
-
-S = "${WORKDIR}"
-SRC_URI += "file://toggle_identify_led.sh"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/toggle_identify_led.sh \
-            ${D}${bindir}/toggle_identify_led.sh
-}
-
-SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button"
-
-ID_BUTTON_SERVICE = "id_button"
-
-TMPL = "phosphor-gpio-monitor@.service"
-INSTFMT = "phosphor-gpio-monitor@{0}.service"
-TGT = "${SYSTEMD_DEFAULT_TARGET}"
-FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}"
-
-SYSTEMD_SERVICE_${PN} += "id-button-pressed.service"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button/id-button-pressed.service b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button/id-button-pressed.service
deleted file mode 100644
index f633fc3..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button/id-button-pressed.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=ID Button Pressed Service
-Wants=mapper-wait@-xyz-openbmc_project-led-groups.service
-After=mapper-wait@-xyz-openbmc_project-led-groups.service
-StartLimitIntervalSec=0
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/env toggle_identify_led.sh
-SyslogIdentifier=id-button
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button/obmc/gpio/id_button b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button/obmc/gpio/id_button
deleted file mode 100644
index b196357..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button/obmc/gpio/id_button
+++ /dev/null
@@ -1,5 +0,0 @@
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=135
-POLARITY=1
-TARGET=id-button-pressed.service
-EXTRA_ARGS=--continue
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button/toggle_identify_led.sh b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button/toggle_identify_led.sh
deleted file mode 100755
index eec96d3..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button/toggle_identify_led.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# Toggle the state of identify LED Group
-
-SERVICE="xyz.openbmc_project.LED.GroupManager"
-INTERFACE="xyz.openbmc_project.Led.Group"
-PROPERTY="Asserted"
-
-# Get current state
-object=$(busctl tree $SERVICE --list | grep identify)
-state=$(busctl get-property $SERVICE $object $INTERFACE $PROPERTY \
-	  |  awk '{print $NF;}')
-
-if [ "$state" == "false" ]; then
-    target='true'
-else
-    target='false'
-fi
-
-# Set target state
-busctl set-property $SERVICE $object $INTERFACE $PROPERTY b $target
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend
deleted file mode 100644
index 4cac490..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-RDEPENDS_${PN} += 'avsbus-control'
-RDEPENDS_${PN} += 'vrm-control'
-RDEPENDS_${PN}_remove += "p9-vcs-workaround"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/images/obmc-phosphor-image.bbappend
deleted file mode 100644
index 772685d..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd liberation-fonts uart-render-controller"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/files/config.yaml b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/files/config.yaml
deleted file mode 100644
index de2e814..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/files/config.yaml
+++ /dev/null
@@ -1,538 +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/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
-5:
-  /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
-6:
-  /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
-7:
-  /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
-8:
-  /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
-9:
-  /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
-10:
-  /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
-11:
-  /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
-12:
-  /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
-13:
-  /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
-14:
-  /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
-15:
-  /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
-16:
-  /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
-17:
-  /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
-18:
-  /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
-19:
-  /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
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/files/sel-config.yaml b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/files/sel-config.yaml
deleted file mode 100755
index 9a5189a..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/files/sel-config.yaml
+++ /dev/null
@@ -1,340 +0,0 @@
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0:
-  sensorID: 0x0B
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1:
-  sensorID: 0x0C
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10:
-  sensorID: 0x15
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11:
-  sensorID: 0x16
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12:
-  sensorID: 0x17
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13:
-  sensorID: 0x18
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14:
-  sensorID: 0x19
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15:
-  sensorID: 0x1A
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2:
-  sensorID: 0x0D
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3:
-  sensorID: 0x0E
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4:
-  sensorID: 0x0F
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5:
-  sensorID: 0x10
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6:
-  sensorID: 0x11
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7:
-  sensorID: 0x12
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8:
-  sensorID: 0x13
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9:
-  sensorID: 0x14
-  sensorType: 0x0C
-  eventReadingType: 0x6F
-  offset: 0x04
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0:
-  sensorID: 0x08
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core0:
-  sensorID: 0x2B
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core1:
-  sensorID: 0x2C
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core2:
-  sensorID: 0x2D
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core3:
-  sensorID: 0x2E
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core4:
-  sensorID: 0x2F
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core5:
-  sensorID: 0x30
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core6:
-  sensorID: 0x31
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core7:
-  sensorID: 0x32
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core8:
-  sensorID: 0x33
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core9:
-  sensorID: 0x34
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core10:
-  sensorID: 0x35
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core11:
-  sensorID: 0x36
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core12:
-  sensorID: 0x37
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core13:
-  sensorID: 0x38
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core14:
-  sensorID: 0x39
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core15:
-  sensorID: 0x3A
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core16:
-  sensorID: 0x3B
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core17:
-  sensorID: 0x3C
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core18:
-  sensorID: 0x3D
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core19:
-  sensorID: 0x3E
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core20:
-  sensorID: 0x3F
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core21:
-  sensorID: 0x40
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core22:
-  sensorID: 0x41
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core23:
-  sensorID: 0x42
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1:
-  sensorID: 0x09
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core0:
-  sensorID: 0x43
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core1:
-  sensorID: 0x44
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core2:
-  sensorID: 0x45
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core3:
-  sensorID: 0x46
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core4:
-  sensorID: 0x47
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core5:
-  sensorID: 0x48
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core6:
-  sensorID: 0x49
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core7:
-  sensorID: 0x4A
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core8:
-  sensorID: 0x4B
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core9:
-  sensorID: 0x4C
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core10:
-  sensorID: 0x4D
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core11:
-  sensorID: 0x4E
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core12:
-  sensorID: 0x4F
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core13:
-  sensorID: 0x50
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core14:
-  sensorID: 0x51
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core15:
-  sensorID: 0x52
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core16:
-  sensorID: 0x53
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core17:
-  sensorID: 0x54
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core18:
-  sensorID: 0x55
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core19:
-  sensorID: 0x56
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core20:
-  sensorID: 0x57
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core21:
-  sensorID: 0x58
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core22:
-  sensorID: 0x59
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core23:
-  sensorID: 0x5A
-  sensorType: 0x07
-  eventReadingType: 0x6F
-  offset: 0x08
-/xyz/openbmc_project/inventory/system/chassis/motherboard:
-  sensorID: 0x8C
-  sensorType: 0xC7
-  eventReadingType: 0x03
-  offset: 0x00
-/xyz/openbmc_project/inventory/system:
-  sensorID: 0x90
-  sensorType: 0x12
-  eventReadingType: 0x6F
-  offset: 0x02
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml
deleted file mode 100644
index ae626ed..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml
+++ /dev/null
@@ -1,159 +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/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'
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml
deleted file mode 100644
index 5973689..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-50:
-  /system/chassis/motherboard/fan0:
-    entityID: 29
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Product Name
-          IPMIFruSection: Product
-51:
-  /system/chassis/motherboard/fan1:
-    entityID: 29
-    entityInstance: 2
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Product Name
-          IPMIFruSection: Product
-52:
-  /system/chassis/motherboard/fan2:
-    entityID: 29
-    entityInstance: 3
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Product Name
-          IPMIFruSection: Product
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend
deleted file mode 100644
index d3f8431..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_append_romulus := ":${THISDIR}/${PN}"
-SRC_URI_append_romulus = " \
-    file://channel.yaml \
-    "
-
-EXTRA_OECONF_append_romulus = " \
-    CHANNEL_YAML_GEN=${WORKDIR}/channel.yaml \
-    "
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml
deleted file mode 100644
index 627f496..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Channel Number (must be unique) is the key
-1:
-  # ifName the ethernet device name (used in the dbus path)
-  ifName: eth0
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml
deleted file mode 100755
index 1938135..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml
+++ /dev/null
@@ -1,3560 +0,0 @@
-2:
-  entityID: 34
-  entityInstance: 1
-  interfaces:
-    xyz.openbmc_project.State.Boot.Progress:
-      BootProgress:
-        Offsets:
-          0:
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.Unspecified
-            type: string
-          1:
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MemoryInit
-            type: string
-          3:
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.SecondaryProcInit
-            type: string
-          7:
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.PCIInit
-            type: string
-          19:
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.OSStart
-            type: string
-          20:
-            set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MotherboardInit
-            type: string
-  mutability: Mutability::Write|Mutability::Read
-  path: /xyz/openbmc_project/state/host0
-  readingType: eventdata2
-  sensorNamePattern: nameProperty
-  sensorReadingType: 111
-  sensorType: 15
-  serviceInterface: org.freedesktop.DBus.Properties
-3:
-  entityID: 210
-  entityInstance: 1
-  interfaces:
-    org.open_power.OCC.Status:
-      OccActive:
-        Offsets:
-          0:
-            assert: false
-            deassert: true
-            type: bool
-          1:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /org/open_power/control/occ0
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 9
-  sensorType: 7
-  serviceInterface: org.freedesktop.DBus.Properties
-4:
-  entityID: 210
-  entityInstance: 2
-  interfaces:
-    org.open_power.OCC.Status:
-      OccActive:
-        Offsets:
-          0:
-            assert: false
-            deassert: true
-            type: bool
-          1:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /org/open_power/control/occ1
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 9
-  sensorType: 7
-  serviceInterface: org.freedesktop.DBus.Properties
-8:
-  entityID: 3
-  entityInstance: 1
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-9:
-  entityID: 3
-  entityInstance: 2
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-11:
-  entityID: 32
-  entityInstance: 1
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm0
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-12:
-  entityID: 32
-  entityInstance: 2
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm1
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-13:
-  entityID: 32
-  entityInstance: 3
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm2
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-14:
-  entityID: 32
-  entityInstance: 4
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm3
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-15:
-  entityID: 32
-  entityInstance: 5
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm4
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-16:
-  entityID: 32
-  entityInstance: 6
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm5
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-17:
-  entityID: 32
-  entityInstance: 7
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm6
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-18:
-  entityID: 32
-  entityInstance: 8
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm7
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-19:
-  entityID: 32
-  entityInstance: 9
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm8
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-20:
-  entityID: 32
-  entityInstance: 10
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm9
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-21:
-  entityID: 32
-  entityInstance: 11
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm10
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-22:
-  entityID: 32
-  entityInstance: 12
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm11
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-23:
-  entityID: 32
-  entityInstance: 13
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm12
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-24:
-  entityID: 32
-  entityInstance: 14
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm13
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-25:
-  entityID: 32
-  entityInstance: 15
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm14
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-26:
-  entityID: 32
-  entityInstance: 16
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          4:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          6:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/dimm15
-  readingType: assertion
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 111
-  sensorType: 12
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-27:
-  bExp: 0
-  entityID: 32
-  entityInstance: 17
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm0_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-28:
-  bExp: 0
-  entityID: 32
-  entityInstance: 18
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm1_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-29:
-  bExp: 0
-  entityID: 32
-  entityInstance: 25
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm2_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-30:
-  bExp: 0
-  entityID: 32
-  entityInstance: 26
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm3_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-31:
-  bExp: 0
-  entityID: 32
-  entityInstance: 27
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm4_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-32:
-  bExp: 0
-  entityID: 32
-  entityInstance: 28
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm5_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-33:
-  bExp: 0
-  entityID: 32
-  entityInstance: 29
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm6_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-34:
-  bExp: 0
-  entityID: 32
-  entityInstance: 30
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm7_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-35:
-  bExp: 0
-  entityID: 32
-  entityInstance: 31
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm8_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-36:
-  bExp: 0
-  entityID: 32
-  entityInstance: 32
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm9_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-37:
-  bExp: 0
-  entityID: 32
-  entityInstance: 19
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm10_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-38:
-  bExp: 0
-  entityID: 32
-  entityInstance: 20
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm11_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-39:
-  bExp: 0
-  entityID: 32
-  entityInstance: 21
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm12_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-40:
-  bExp: 0
-  entityID: 32
-  entityInstance: 22
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm13_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-41:
-  bExp: 0
-  entityID: 32
-  entityInstance: 23
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm14_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-42:
-  bExp: 0
-  entityID: 32
-  entityInstance: 24
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/dimm15_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-43:
-  entityID: 208
-  entityInstance: 1
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core0
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-44:
-  entityID: 208
-  entityInstance: 2
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core1
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-45:
-  entityID: 208
-  entityInstance: 3
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core2
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-46:
-  entityID: 208
-  entityInstance: 4
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core3
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-47:
-  entityID: 208
-  entityInstance: 5
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core4
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-48:
-  entityID: 208
-  entityInstance: 6
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core5
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-49:
-  entityID: 208
-  entityInstance: 7
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core6
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-50:
-  entityID: 208
-  entityInstance: 8
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core7
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-51:
-  entityID: 208
-  entityInstance: 9
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core8
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-52:
-  entityID: 208
-  entityInstance: 10
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core9
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-53:
-  entityID: 208
-  entityInstance: 11
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core10
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-54:
-  entityID: 208
-  entityInstance: 12
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core11
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-55:
-  entityID: 208
-  entityInstance: 13
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core12
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-56:
-  entityID: 208
-  entityInstance: 14
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core13
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-57:
-  entityID: 208
-  entityInstance: 15
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core14
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-58:
-  entityID: 208
-  entityInstance: 16
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core15
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-59:
-  entityID: 208
-  entityInstance: 17
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core16
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-60:
-  entityID: 208
-  entityInstance: 18
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core17
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-61:
-  entityID: 208
-  entityInstance: 19
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core18
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-62:
-  entityID: 208
-  entityInstance: 20
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core19
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-63:
-  entityID: 208
-  entityInstance: 21
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core20
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-64:
-  entityID: 208
-  entityInstance: 22
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core21
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-65:
-  entityID: 208
-  entityInstance: 23
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core22
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-66:
-  entityID: 208
-  entityInstance: 24
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu0/core23
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-67:
-  entityID: 208
-  entityInstance: 25
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core0
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-68:
-  entityID: 208
-  entityInstance: 26
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core1
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-69:
-  entityID: 208
-  entityInstance: 27
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core2
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-70:
-  entityID: 208
-  entityInstance: 28
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core3
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-71:
-  entityID: 208
-  entityInstance: 29
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core4
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-72:
-  entityID: 208
-  entityInstance: 30
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core5
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-73:
-  entityID: 208
-  entityInstance: 31
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core6
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-74:
-  entityID: 208
-  entityInstance: 32
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core7
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-75:
-  entityID: 208
-  entityInstance: 33
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core8
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-76:
-  entityID: 208
-  entityInstance: 34
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core9
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-77:
-  entityID: 208
-  entityInstance: 35
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core10
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-78:
-  entityID: 208
-  entityInstance: 36
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core11
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-79:
-  entityID: 208
-  entityInstance: 37
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core12
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-80:
-  entityID: 208
-  entityInstance: 38
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core13
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-81:
-  entityID: 208
-  entityInstance: 39
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core14
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-82:
-  entityID: 208
-  entityInstance: 40
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core15
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-83:
-  entityID: 208
-  entityInstance: 41
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core16
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-84:
-  entityID: 208
-  entityInstance: 42
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core17
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-85:
-  entityID: 208
-  entityInstance: 43
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core18
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-86:
-  entityID: 208
-  entityInstance: 44
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core19
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-87:
-  entityID: 208
-  entityInstance: 45
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core20
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-88:
-  entityID: 208
-  entityInstance: 46
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core21
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-89:
-  entityID: 208
-  entityInstance: 47
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core22
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-90:
-  entityID: 208
-  entityInstance: 48
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          7:
-            assert: true
-            deassert: false
-            skipOn: deassert
-            type: bool
-    xyz.openbmc_project.State.Decorator.OperationalStatus:
-      Functional:
-        Offsets:
-          8:
-            assert: false
-            deassert: true
-            type: bool
-        Prereqs:
-          7:
-            assert: true
-            deassert: false
-            type: bool
-  mutability: Mutability::Write|Mutability::Read
-  path: /system/chassis/motherboard/cpu1/core23
-  readingType: assertion
-  sensorNamePattern: nameParentLeaf
-  sensorReadingType: 111
-  sensorType: 7
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-91:
-  bExp: 0
-  entityID: 208
-  entityInstance: 49
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core0_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-92:
-  bExp: 0
-  entityID: 208
-  entityInstance: 50
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core1_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-93:
-  bExp: 0
-  entityID: 208
-  entityInstance: 51
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core2_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-94:
-  bExp: 0
-  entityID: 208
-  entityInstance: 52
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core3_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-95:
-  bExp: 0
-  entityID: 208
-  entityInstance: 53
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core4_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-96:
-  bExp: 0
-  entityID: 208
-  entityInstance: 54
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core5_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-97:
-  bExp: 0
-  entityID: 208
-  entityInstance: 55
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core6_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-98:
-  bExp: 0
-  entityID: 208
-  entityInstance: 56
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core7_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-99:
-  bExp: 0
-  entityID: 208
-  entityInstance: 57
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core8_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-100:
-  bExp: 0
-  entityID: 208
-  entityInstance: 58
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core9_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-101:
-  bExp: 0
-  entityID: 208
-  entityInstance: 59
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core10_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-102:
-  bExp: 0
-  entityID: 208
-  entityInstance: 60
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core11_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-103:
-  bExp: 0
-  entityID: 208
-  entityInstance: 61
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core12_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-104:
-  bExp: 0
-  entityID: 208
-  entityInstance: 62
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core13_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-105:
-  bExp: 0
-  entityID: 208
-  entityInstance: 63
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core14_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-106:
-  bExp: 0
-  entityID: 208
-  entityInstance: 64
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core15_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-107:
-  bExp: 0
-  entityID: 208
-  entityInstance: 65
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core16_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-108:
-  bExp: 0
-  entityID: 208
-  entityInstance: 66
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core17_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-109:
-  bExp: 0
-  entityID: 208
-  entityInstance: 67
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core18_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-110:
-  bExp: 0
-  entityID: 208
-  entityInstance: 68
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core19_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-111:
-  bExp: 0
-  entityID: 208
-  entityInstance: 69
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core20_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-112:
-  bExp: 0
-  entityID: 208
-  entityInstance: 70
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core21_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-113:
-  bExp: 0
-  entityID: 208
-  entityInstance: 71
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core22_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-114:
-  bExp: 0
-  entityID: 208
-  entityInstance: 72
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p0_core23_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-115:
-  bExp: 0
-  entityID: 208
-  entityInstance: 73
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core0_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-116:
-  bExp: 0
-  entityID: 208
-  entityInstance: 74
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core1_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-117:
-  bExp: 0
-  entityID: 208
-  entityInstance: 75
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core2_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-118:
-  bExp: 0
-  entityID: 208
-  entityInstance: 76
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core3_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-119:
-  bExp: 0
-  entityID: 208
-  entityInstance: 77
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core4_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-120:
-  bExp: 0
-  entityID: 208
-  entityInstance: 78
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core5_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-121:
-  bExp: 0
-  entityID: 208
-  entityInstance: 79
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core6_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-122:
-  bExp: 0
-  entityID: 208
-  entityInstance: 80
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core7_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-123:
-  bExp: 0
-  entityID: 208
-  entityInstance: 81
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core8_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-124:
-  bExp: 0
-  entityID: 208
-  entityInstance: 82
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core9_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-125:
-  bExp: 0
-  entityID: 208
-  entityInstance: 83
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core10_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-126:
-  bExp: 0
-  entityID: 208
-  entityInstance: 84
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core11_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-127:
-  bExp: 0
-  entityID: 208
-  entityInstance: 85
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core12_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-128:
-  bExp: 0
-  entityID: 208
-  entityInstance: 86
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core13_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-129:
-  bExp: 0
-  entityID: 208
-  entityInstance: 87
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core14_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-130:
-  bExp: 0
-  entityID: 208
-  entityInstance: 88
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core15_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-131:
-  bExp: 0
-  entityID: 208
-  entityInstance: 89
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core16_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-132:
-  bExp: 0
-  entityID: 208
-  entityInstance: 90
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core17_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-133:
-  bExp: 0
-  entityID: 208
-  entityInstance: 91
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core18_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-134:
-  bExp: 0
-  entityID: 208
-  entityInstance: 92
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core19_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-135:
-  bExp: 0
-  entityID: 208
-  entityInstance: 93
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core20_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-136:
-  bExp: 0
-  entityID: 208
-  entityInstance: 94
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core21_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-137:
-  bExp: 0
-  entityID: 208
-  entityInstance: 95
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core22_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-138:
-  bExp: 0
-  entityID: 208
-  entityInstance: 96
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          255:
-            type: int64_t
-  multiplierM: 1
-  mutability: Mutability::Write|Mutability::Read
-  offsetB: -127
-  path: /xyz/openbmc_project/sensors/temperature/p1_core23_temp
-  rExp: 0
-  readingType: readingData
-  scale: -3
-  sensorNamePattern: nameLeaf
-  sensorReadingType: 1
-  sensorType: 1
-  serviceInterface: org.freedesktop.DBus.Properties
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-139:
-  entityID: 34
-  entityInstance: 2
-  interfaces:
-    xyz.openbmc_project.Control.Boot.RebootAttempts:
-      AttemptsLeft:
-        Offsets:
-          255:
-            type: uint32_t
-  mutability: Mutability::Write|Mutability::Read
-  path: /xyz/openbmc_project/state/host0
-  readingType: readingAssertion
-  sensorNamePattern: nameProperty
-  sensorReadingType: 111
-  sensorType: 195
-  serviceInterface: org.freedesktop.DBus.Properties
-145:
-  entityID: 35
-  entityInstance: 1
-  interfaces:
-    xyz.openbmc_project.State.OperatingSystem.Status:
-      OperatingSystemState:
-        Offsets:
-          1:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CBoot
-            type: string
-          2:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.PXEBoot
-            type: string
-          3:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.DiagBoot
-            type: string
-          4:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CDROMBoot
-            type: string
-          5:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.ROMBoot
-            type: string
-          6:
-            assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.BootComplete
-            type: string
-  mutability: Mutability::Write|Mutability::Read
-  path: /xyz/openbmc_project/state/host0
-  readingType: assertion
-  sensorNamePattern: nameProperty
-  sensorReadingType: 111
-  sensorType: 31
-  serviceInterface: org.freedesktop.DBus.Properties
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-inventory-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-inventory-native.bb
deleted file mode 100644
index 5551200..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-inventory-native.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Romulus inventory map for phosphor-ipmi-host"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-inherit phosphor-ipmi-host
-
-SRC_URI += "file://config.yaml"
-
-PROVIDES += "virtual/phosphor-ipmi-fru-read-inventory"
-
-S = "${WORKDIR}"
-
-do_install() {
-        DEST=${D}${config_datadir}
-        install -d ${DEST}
-        install config.yaml ${DEST}
-}
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map-native.bb
deleted file mode 100644
index c418498..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map-native.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "Romulus 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-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-sel-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-sel-native.bb
deleted file mode 100644
index 93907c8..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-sel-native.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Inventory to Sensor config for Romulus"
-PR = "r1"
-
-inherit native
-inherit phosphor-ipmi-host
-inherit obmc-phosphor-license
-
-PROVIDES += "virtual/phosphor-ipmi-inventory-sel"
-
-SRC_URI += "file://sel-config.yaml"
-
-S = "${WORKDIR}"
-
-do_install() {
-        DEST=${D}${sensor_datadir}
-        install -d ${DEST}
-        install sel-config.yaml ${DEST}/invsensor.yaml
-}
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config-native.bb
deleted file mode 100644
index 3c7adaa..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config-native.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Phosphor LED Group Management for Romulus"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-
-PROVIDES += "virtual/phosphor-led-manager-config-native"
-
-SRC_URI += "file://led.yaml"
-S = "${WORKDIR}"
-
-# Overwrite the example led layout yaml file prior
-# to building the phosphor-led-manager package
-do_install() {
-    SRC=${S}
-    DEST=${D}${datadir}/phosphor-led-manager
-    install -D ${SRC}/led.yaml ${DEST}/led.yaml
-}
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config/led.yaml b/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config/led.yaml
deleted file mode 100755
index b2e96c2..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config/led.yaml
+++ /dev/null
@@ -1,335 +0,0 @@
-bmc_booted:
-    power:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-        Priority: 'On'
-
-power_on:
-    power:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'On'
-
-enclosure_fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-
-enclosure_identify:
-    identify:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-
-# The Op Panel on the Romulus system holds a multicolor LED.
-# Both the 'fault' and 'identify' gpios are wired to the same LED.
-# By holding one in 'on' while the other in 'blink' state, ensures
-# the manufacturing process can verify both colors function
-lamp_test:
-    fault:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-        Priority: 'Blink'
-    identify:
-        Action: 'On'
-
-# All kinds of faults using the same action as enclosure_fault
-Fan0Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-Fan1Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-Fan2Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-bmcFault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core0Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core1Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core2Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core3Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core4Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core5Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core6Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core7Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core8Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core9Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core10Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core11Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core12Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core13Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core14Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core15Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core16Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core17Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core18Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core19Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core20Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core21Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core22Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-core23Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-cpu0Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-cpu1Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm0Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm1Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm2Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm3Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm4Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm5Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm6Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm7Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm8Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm9Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm10Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm11Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm12Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm13Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm14Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-dimm15Fault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-motherboardFault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-occFault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
-systemFault:
-    fault:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'Blink'
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml b/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml
deleted file mode 100644
index 02bb3d8..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-# TODO: Add i2c devices like
-# /sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052: /system/chassis/motherboard
-/sys/devices/platform/gpio-fsi/fsi0/slave@00:00/raw: /system/chassis/motherboard/cpu0
-/sys/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/raw: /system/chassis/motherboard/cpu1
-
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/logging/romulus-phosphor-logging-callouts-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/logging/romulus-phosphor-logging-callouts-native.bb
deleted file mode 100644
index 3752139..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/logging/romulus-phosphor-logging-callouts-native.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Romulus inventory map for phosphor-ipmi-host"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-inherit phosphor-logging
-
-SRC_URI += "file://callouts.yaml"
-
-PROVIDES += "virtual/phosphor-logging-callouts"
-
-S = "${WORKDIR}"
-
-do_install() {
-        DEST=${D}${callouts_datadir}
-        install -d ${DEST}
-        install callouts.yaml ${DEST}
-}
-
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/mboxd/mboxd.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/mboxd/mboxd.bbappend
deleted file mode 100644
index 8b6248a..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/mboxd/mboxd.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-MBOXD_FLASH_SIZE = "64M"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
deleted file mode 100644
index ea1a7e3..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-RDEPENDS_${PN}-inventory += " openpower-occ-control phosphor-cooling-type id-button"
-RDEPENDS_${PN}-extras += " phosphor-webui phosphor-image-signing"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
deleted file mode 100644
index 536d797..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ /dev/null
@@ -1,23 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-EXTRA_OECONF_append_romulus = " --enable-negative-errno-on-fail"
-
-CHIPS = " \
-        i2c@1e78a000/i2c-bus@440/w83773g@4c \
-        pwm-tacho-controller@1e786000 \
-        "
-ITEMSFMT = "ahb/apb/{0}.conf"
-
-ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
-
-OCCS = " \
-       00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \
-       00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \
-       "
-
-OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf"
-OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}"
-
-ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'OCCITEMS')}"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/w83773g@4c.conf b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/w83773g@4c.conf
deleted file mode 100644
index 86a8026..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/w83773g@4c.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-LABEL_temp1 = "outlet"
-WARNHI_temp1 = "60000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "70000"
-CRITLO_temp1 = "0"
-
-LABEL_temp2 = "inlet_cpu"
-WARNHI_temp2 = "60000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "70000"
-CRITLO_temp2 = "0"
-
-LABEL_temp3 = "inlet_io"
-WARNHI_temp3 = "60000"
-WARNLO_temp3 = "0"
-CRITHI_temp3 = "70000"
-CRITLO_temp3 = "0"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
deleted file mode 100644
index 374115c..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Romulus has 7 fan ports but only 3 are used
-LABEL_fan9 = "fan0"
-LABEL_fan11 = "fan1"
-LABEL_fan13 = "fan2"
-
-PWM_TARGET_fan9 = "1"
-PWM_TARGET_fan11 = "2"
-PWM_TARGET_fan13 = "1"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
deleted file mode 100644
index 792ae09..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.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_temp91 = "p0_core0_temp"
-LABEL_temp92 = "p0_core1_temp"
-LABEL_temp93 = "p0_core2_temp"
-LABEL_temp94 = "p0_core3_temp"
-LABEL_temp95 = "p0_core4_temp"
-LABEL_temp96 = "p0_core5_temp"
-LABEL_temp97 = "p0_core6_temp"
-LABEL_temp98 = "p0_core7_temp"
-LABEL_temp99 = "p0_core8_temp"
-LABEL_temp100 = "p0_core9_temp"
-LABEL_temp101 = "p0_core10_temp"
-LABEL_temp102 = "p0_core11_temp"
-LABEL_temp103 = "p0_core12_temp"
-LABEL_temp104 = "p0_core13_temp"
-LABEL_temp105 = "p0_core14_temp"
-LABEL_temp106 = "p0_core15_temp"
-LABEL_temp107 = "p0_core16_temp"
-LABEL_temp108 = "p0_core17_temp"
-LABEL_temp109 = "p0_core18_temp"
-LABEL_temp110 = "p0_core19_temp"
-LABEL_temp111 = "p0_core20_temp"
-LABEL_temp112 = "p0_core21_temp"
-LABEL_temp113 = "p0_core22_temp"
-LABEL_temp114 = "p0_core23_temp"
-LABEL_temp27 = "dimm0_temp"
-LABEL_temp28 = "dimm1_temp"
-LABEL_temp29 = "dimm2_temp"
-LABEL_temp30 = "dimm3_temp"
-LABEL_temp31 = "dimm4_temp"
-LABEL_temp32 = "dimm5_temp"
-LABEL_temp33 = "dimm6_temp"
-LABEL_temp34 = "dimm7_temp"
-LABEL_power2 = "p0_power"
-LABEL_power3 = "p0_vdd_power"
-LABEL_power4 = "p0_vdn_power"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
deleted file mode 100644
index 383c70d..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.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_temp115 = "p1_core0_temp"
-LABEL_temp116 = "p1_core1_temp"
-LABEL_temp117 = "p1_core2_temp"
-LABEL_temp118 = "p1_core3_temp"
-LABEL_temp119 = "p1_core4_temp"
-LABEL_temp120 = "p1_core5_temp"
-LABEL_temp121 = "p1_core6_temp"
-LABEL_temp122 = "p1_core7_temp"
-LABEL_temp123 = "p1_core8_temp"
-LABEL_temp124 = "p1_core9_temp"
-LABEL_temp125 = "p1_core10_temp"
-LABEL_temp126 = "p1_core11_temp"
-LABEL_temp127 = "p1_core12_temp"
-LABEL_temp128 = "p1_core13_temp"
-LABEL_temp129 = "p1_core14_temp"
-LABEL_temp130 = "p1_core15_temp"
-LABEL_temp131 = "p1_core16_temp"
-LABEL_temp132 = "p1_core17_temp"
-LABEL_temp133 = "p1_core18_temp"
-LABEL_temp134 = "p1_core19_temp"
-LABEL_temp135 = "p1_core20_temp"
-LABEL_temp136 = "p1_core21_temp"
-LABEL_temp137 = "p1_core22_temp"
-LABEL_temp138 = "p1_core23_temp"
-LABEL_temp35 = "dimm8_temp"
-LABEL_temp36 = "dimm9_temp"
-LABEL_temp37 = "dimm10_temp"
-LABEL_temp38 = "dimm11_temp"
-LABEL_temp39 = "dimm12_temp"
-LABEL_temp40 = "dimm13_temp"
-LABEL_temp41 = "dimm14_temp"
-LABEL_temp42 = "dimm15_temp"
-LABEL_power2 = "p1_power"
-LABEL_power3 = "p1_vdd_power"
-LABEL_power4 = "p1_vdn_power"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager.bbappend
deleted file mode 100644
index 4db6f3a..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager/obmc/phosphor-reboot-host/reboot.conf b/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager/obmc/phosphor-reboot-host/reboot.conf
deleted file mode 100644
index ad50cf6..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/state/phosphor-state-manager/obmc/phosphor-reboot-host/reboot.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sleep 8 seconds on Romulus to make sure the checkstop status on
-# CPU is cleared. See https://github.com/openbmc/openbmc/issues/3330
-REBOOT_DELAY=8
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/workbook/romulus-config.bb b/meta-ibm/meta-romulus/recipes-phosphor/workbook/romulus-config.bb
deleted file mode 100644
index 6abc16b..0000000
--- a/meta-ibm/meta-romulus/recipes-phosphor/workbook/romulus-config.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SUMMARY = "Romulus board wiring"
-DESCRIPTION = "Board wiring information for the Romulus OpenPOWER system."
-PR = "r1"
-
-inherit config-in-skeleton
diff --git a/meta-ibm/meta-romulus/recipes.txt b/meta-ibm/meta-romulus/recipes.txt
deleted file mode 100644
index 3ec3f4a..0000000
--- a/meta-ibm/meta-romulus/recipes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-recipes-kernel       - The kernel and generic applications/libraries with strong kernel dependencies
-recipes-phosphor     - Phosphor OpenBMC applications and configuration
diff --git a/meta-ibm/meta-witherspoon/README.md b/meta-ibm/meta-witherspoon/README.md
deleted file mode 100644
index beb3ca9..0000000
--- a/meta-ibm/meta-witherspoon/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Witherspoon
-================
-
-This is the Witherspoon machine layer.
-
-Witherspoon, or AC922, is an IBM POWER9 two-socket, 2U Accelerated Compute
-Server with up to 6 NVIDIA Tesla GPUs. More information can be found
-[here](https://www.ibm.com/us-en/marketplace/power-systems-ac922).
diff --git a/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample b/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
deleted file mode 100644
index 414cb61..0000000
--- a/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,35 +0,0 @@
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-LCONF_VERSION = "7"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \
-  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon \
-  "
diff --git a/meta-ibm/meta-witherspoon/conf/conf-notes.txt b/meta-ibm/meta-witherspoon/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a..0000000
--- a/meta-ibm/meta-witherspoon/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf b/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
deleted file mode 100644
index f24a74b..0000000
--- a/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-require conf/distro/include/phosphor-base.inc
-require conf/distro/include/phosphor-ubi.inc
-require conf/distro/include/openpower-mrw.inc
-require conf/distro/include/openpower-ubi.inc
-require conf/distro/include/openpower-distrovars.inc
diff --git a/meta-ibm/meta-witherspoon/conf/layer.conf b/meta-ibm/meta-witherspoon/conf/layer.conf
deleted file mode 100644
index 6ea5041..0000000
--- a/meta-ibm/meta-witherspoon/conf/layer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-            ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "witherspoon"
-BBFILE_PATTERN_witherspoon = ""
-LAYERSERIES_COMPAT_witherspoon = "sumo"
diff --git a/meta-ibm/meta-witherspoon/conf/local.conf.sample b/meta-ibm/meta-witherspoon/conf/local.conf.sample
deleted file mode 100644
index ca640ce..0000000
--- a/meta-ibm/meta-witherspoon/conf/local.conf.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-MACHINE ??= "witherspoon"
-DISTRO ?= "openbmc-witherspoon"
-PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
-    STOPTASKS,${TMPDIR},1G,100K \
-    STOPTASKS,${DL_DIR},1G,100K \
-    STOPTASKS,${SSTATE_DIR},1G,100K \
-    STOPTASKS,/tmp,100M,100K \
-    ABORT,${TMPDIR},100M,1K \
-    ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K \
-    ABORT,/tmp,10M,1K"
-CONF_VERSION = "1"
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
-  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
-  "
diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
deleted file mode 100644
index 1ccd1cf..0000000
--- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
-KERNEL_FEATURES_append = " phosphor-wdt-on-panic"
-
-UBOOT_MACHINE = "ast_g5_ncsi_config"
-
-OBMC_POWER_SUPPLY_INSTANCES = "0 1"
-
-PREFERRED_PROVIDER_virtual/p9-vcs-workaround = ''
-
-require conf/machine/include/ast2500.inc
-require conf/machine/include/obmc-bsp-common.inc
-require conf/machine/include/ibm.inc
-require conf/machine/include/p9.inc
-
-PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml"
-PHOSPHOR_MRW_REV = "6ca015dbd3e1e9d5206f9ec13ec9db2d8965e181"
-
-# Inhibit phosphor-hwmon-config-mrw
-VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
-
-# Pick up the Witherspoon-specific IPMI configuration
-VIRTUAL-RUNTIME_ipmi-config = "witherspoon-ipmi-config"
-
-# Inhibit phosphor-fan-presence-mrw-native
-PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
-    "phosphor-fan-presence-config-native"
-
-# Inhibit phosphor-fan-control-fan-config-mrw-native
-PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \
-    "phosphor-fan-control-fan-config-native"
-
-PREFERRED_RPROVIDER_virtual/phosphor-ipmi-config = "witherspoon-ipmi-config"
diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-size-policy.conf b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-size-policy.conf
deleted file mode 100644
index fb84c67..0000000
--- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-size-policy.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file overrides a default for journald
-#
-# - Set a maximum size for journald in filesystem
-#
-# See journald.conf(5) for details
-
-[Journal]
-SystemMaxUse=2.5M
diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-storage-policy.conf b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-storage-policy.conf
deleted file mode 100644
index eb746a5..0000000
--- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-storage-policy.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file overrides a default for journald
-#
-# - Default journald to write to persistent storage
-#
-# See journald.conf(5) for details
-
-[Journal]
-Storage=persistent
diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/systemd-journald-override.conf b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/systemd-journald-override.conf
deleted file mode 100644
index 0ca86f8..0000000
--- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/systemd-journald-override.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Unit]
-Wants=local-fs.target
-After=local-fs.target
diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
deleted file mode 100644
index 847714b..0000000
--- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
+++ /dev/null
@@ -1,14 +0,0 @@
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += "file://journald-storage-policy.conf"
-SRC_URI += "file://systemd-journald-override.conf"
-SRC_URI += "file://journald-size-policy.conf"
-
-FILES_${PN} += "${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf"
-FILES_${PN} += "${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf"
-FILES_${PN} += "${systemd_unitdir}/journald.conf.d/journald-size-policy.conf"
-
-do_install_append() {
-        install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf
-        install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf
-        install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/witherspoon.cfg b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/witherspoon.cfg
deleted file mode 100644
index dc41d58..0000000
--- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/witherspoon.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_SENSORS_IIO_HWMON=y
-CONFIG_SENSORS_TMP421=y
-CONFIG_SENSORS_MAX31785=y
-CONFIG_SENSORS_UCD9000=y
-CONFIG_RTC_DRV_RV8803=y
-CONFIG_IIO=y
-CONFIG_BMP280=y
diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend
deleted file mode 100644
index cad9140..0000000
--- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend_witherspoon := "${THISDIR}/${PN}:"
-SRC_URI += "file://witherspoon.cfg"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb
deleted file mode 100644
index a09cdc7..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SUMMARY = "Witherspoon AVSBus control"
-PR = "r1"
-
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
-
-RDEPENDS_${PN} += "i2c-tools"
-
-S = "${WORKDIR}"
-SRC_URI += "file://power-workarounds.sh \
-            file://avsbus-enable.sh \
-            file://avsbus-disable.sh"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/power-workarounds.sh \
-            ${D}${bindir}/power-workarounds.sh
-        install -m 0755 ${WORKDIR}/avsbus-disable.sh \
-            ${D}${bindir}/avsbus-disable.sh
-        install -m 0755 ${WORKDIR}/avsbus-enable.sh \
-            ${D}${bindir}/avsbus-enable.sh
-}
-
-TMPL_EN= "avsbus-enable@.service"
-TMPL_DIS= "avsbus-disable@.service"
-TMPL_WA= "power-workarounds@.service"
-INSTFMT_EN= "avsbus-enable@{0}.service"
-INSTFMT_DIS= "avsbus-disable@{0}.service"
-INSTFMT_WA= "power-workarounds@{0}.service"
-TGTFMT = "obmc-chassis-poweron@{0}.target"
-FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}"
-FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}"
-FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL_EN}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "${TMPL_DIS}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "${TMPL_WA}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable.sh
deleted file mode 100644
index a158f15..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-i2cset -y 4 0x70 0x00 0x00 b    # VDD 0  - PAGE set
-i2cset -y 4 0x70 0x01 0x80 b    # VDD 0
-i2cset -y 4 0x70 0x00 0x01 b    # VCS 0  - PAGE set
-i2cset -y 4 0x70 0x01 0x80 b    # VCS 0
-i2cset -y 4 0x70 0x00 0x00 b    # VCS 0  - PAGE reset
-i2cset -y 4 0x71 0x00 0x00 b    # VDN 0  - PAGE set
-i2cset -y 4 0x71 0x01 0x80 b    # VDN 0
-i2cset -y 5 0x70 0x00 0x00 b    # VDD 1  - PAGE set
-i2cset -y 5 0x70 0x01 0x80 b    # VDD 1
-i2cset -y 5 0x70 0x00 0x01 b    # VCS 1  - PAGE set
-i2cset -y 5 0x70 0x01 0x80 b    # VCS 1
-i2cset -y 5 0x70 0x00 0x00 b    # VCS 1  - PAGE reset
-i2cset -y 5 0x71 0x00 0x00 b    # VDN 1  - PAGE set
-i2cset -y 5 0x71 0x01 0x80 b    # VDN 1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
deleted file mode 100644
index 859f428..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Disable the AVS bus on the VRMs
-Wants=power-workarounds@%i.service
-After=power-workarounds@%i.service
-Before=vrm-control@%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env avsbus-disable.sh
-SyslogIdentifier=avsbus-disable.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable.sh
deleted file mode 100644
index 6306c58..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-i2cset -y 4 0x70 0x00 0x00 b    # VDD 0  - PAGE set
-i2cset -y 4 0x70 0x21 0x00 0x01 i    # VDD 0  - Set default HW boot voltage
-i2cset -y 4 0x70 0x01 0xB0 b    # VDD 0
-i2cset -y 4 0x70 0x00 0x01 b    # VCS 0  - PAGE set
-i2cset -y 4 0x70 0x21 0x08 0x01 i    # VCS 0  - Set default HW boot voltage
-i2cset -y 4 0x70 0x01 0xB0 b    # VCS 0
-i2cset -y 4 0x70 0x00 0x00 b    # VCS 0  - PAGE reset
-i2cset -y 4 0x71 0x00 0x00 b    # VDN 0  - PAGE set
-i2cset -y 4 0x71 0x21 0x00 0x01 i    # VDN 0  - Set default HW boot voltage
-i2cset -y 4 0x71 0x01 0xB0 b    # VDN 0
-i2cset -y 5 0x70 0x00 0x00 b    # VDD 1  - PAGE set
-i2cset -y 5 0x70 0x21 0x00 0x01 i    # VDD 1  - Set default HW boot voltage
-i2cset -y 5 0x70 0x01 0xB0 b    # VDD 1
-i2cset -y 5 0x70 0x00 0x01 b    # VCS 1  - PAGE set
-i2cset -y 5 0x70 0x21 0x08 0x01 i    # VCS 1  - Set default HW boot voltage
-i2cset -y 5 0x70 0x01 0xB0 b    # VCS 1
-i2cset -y 5 0x70 0x00 0x00 b    # VCS 1  - PAGE reset
-i2cset -y 5 0x71 0x00 0x00 b    # VDN 1  - PAGE set
-i2cset -y 5 0x71 0x21 0x00 0x01 i   # VDN 1  - Set default HW boot voltage
-i2cset -y 5 0x71 0x01 0xB0 b    # VDN 1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
deleted file mode 100644
index b7fb41e..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Enable the AVS bus on VRMs
-Wants=vrm-control@%i.service
-After=vrm-control@%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env avsbus-enable.sh
-SyslogIdentifier=avsbus-enable.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds.sh
deleted file mode 100644
index d405797..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds.sh
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/sh
-
-# ensure VCS ON_OFF_CONFIG set correctly from prior FW drivers
-# A side
-i2cset -y 4 0x70 0x00 0x01 b
-i2cset -y 4 0x70 0x02 0x16 b #respond to ENABLE pin
-i2cset -y 4 0x70 0x00 0x00 b
-# B side
-i2cset -y 5 0x70 0x00 0x01 b
-i2cset -y 5 0x70 0x02 0x16 b #respond to ENABLE pin
-i2cset -y 5 0x70 0x00 0x00 b
-
-# vddio = 1.0V, mdat/sdat PU enabled
-i2cset -y 4 0x12 0xFF 0x00 b # VDD/VCS 0
-i2cset -y 4 0x12 0x2E 0x03 b # VDD/VCS 0
-i2cset -y 4 0x13 0xFF 0x00 b # VDN 0
-i2cset -y 4 0x13 0x2E 0x03 b # VDN 0
-i2cset -y 5 0x12 0xFF 0x00 b # VDD/VCS 1
-i2cset -y 5 0x12 0x2E 0x03 b # VDD/VCS 1
-i2cset -y 5 0x13 0xFF 0x00 b # VDN 1
-i2cset -y 5 0x13 0x2E 0x03 b # VDN 1
-
-# A side VDDR - set to 1.23V
-i2cset -y 4 0x71 0x00 0x01
-i2cset -y 4 0x71 0x21 0x3B 0x01 i
-i2cset -y 4 0x71 0x00 0x00
-
-# B side VDDR - set to 1.23V
-i2cset -y 5 0x71 0x00 0x01
-i2cset -y 5 0x71 0x21 0x3B 0x01 i
-i2cset -y 5 0x71 0x00 0x00
-
-# VDN A - PGOOD_ON threshold
-i2cset -y 4 0x71 0x00 0x00 b # PAGE
-i2cset -y 4 0x71 0x5E 0xCD 0x00 i # set to 0.8V
-
-# VDN B - PGOOD_ON threshold
-i2cset -y 5 0x71 0x00 0x00 b # PAGE
-i2cset -y 5 0x71 0x5E 0xCD 0x00 i # set to 0.8V
-
-# unbind ucd driver to permit i2cset
-ucd_retries=5
-ucd=
-
-ucdpath="/sys/bus/i2c/drivers/ucd9000"
-if [ -e $ucdpath ]
-then
-  ucd=`ls -1 $ucdpath | grep 64`
-  if [ -n "$ucd" ]
-  then
-    echo $ucd > $ucdpath/unbind
-  fi
-fi
-
-# make sure VCS ON_OFF_CONFIG set correctly from old FW releases
-i2cset -y 11 0x64 0x00 0x0E i
-i2cset -y 11 0x64 0x02 0x16 i
-i2cset -y 11 0x64 0x00 0x0F i
-i2cset -y 11 0x64 0x02 0x16 i
-
-## move memory enables to align with VDN (VDN to VDDR leakage issue)
-#GPO_CONFIG_1 (GPIO15) : mem 0 reg enables
-i2cset -y 11 0x64 0xF7 0x00 i
-i2cset -y 11 0x64 0xF8 0x15 0x6E 0x80 0x08 0x00 0x00 0x00 0x40 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 i
-#GPO_CONFIG_2 (GPIO7) : mem 1 reg enables
-i2cset -y 11 0x64 0xF7 0x01 i
-i2cset -y 11 0x64 0xF8 0x15 0x16 0x80 0x08 0x00 0x00 0x20 0x40 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 i
-
-# change VDN delays based on UCD MFR_REVISION setting
-REV=`i2cget -y 11 0x64 0x9B i 2|cut -f2 -d' '`
-if [ "$REV" == "0x01" -o "$REV" == "0x02" ] ; then
-  # use 20ms delay for VDN
-  #TON_DELAY rail 8
-  i2cset -y 11 0x64 0x00 0x07 i
-  i2cset -y 11 0x64 0x60 0x80 0xDA i
-  #TON_DELAY rail 9
-  i2cset -y 11 0x64 0x00 0x08 i
-  i2cset -y 11 0x64 0x60 0x80 0xDA i
-else
-  # use 70ms delay for VDN
-  #TON_DELAY rail 8
-  i2cset -y 11 0x64 0x00 0x07 i
-  i2cset -y 11 0x64 0x60 0x30 0xEA i
-  #TON_DELAY rail 9
-  i2cset -y 11 0x64 0x00 0x08 i
-  i2cset -y 11 0x64 0x60 0x30 0xEA i
-fi
-
-# Raise AVDD +100mV
-i2cset -y 11 0x64 0x00 0x09 i # set PAGE
-i2cset -y 11 0x64 0xF5 0x81 i # set margin_config
-i2cset -y 11 0x64 0x21 0x85 0x33 i # set VOUT_COMMAND
-
-# Increase over-current settings
-#VDD A phase current
-i2cset -y 4 0x12 0xFF 0x04 b    # set window register high byte to 4
-i2cset -y 4 0x12 0x3C 0x80 b    # Set to 64A
-#VDD B phase current
-i2cset -y 5 0x12 0xFF 0x04 b    # set window register high byte to 4
-i2cset -y 5 0x12 0x3C 0x80 b    # Set to 64A
-#VDD A master OC fault to 445A
-i2cset -y 4 0x70 0x00 0x00 b    # PAGE
-i2cset -y 4 0x70 0x46 0x08DE w
-# VDD A master OC warn to 326A
-i2cset -y 4 0x70 0x4A 0x08A3 w # A308
-#VDD B master OC fault to 445A
-i2cset -y 5 0x70 0x00 0x00 b    # PAGE
-i2cset -y 5 0x70 0x46 0x08DE w
-# VDD B master OC warn to 326A
-i2cset -y 5 0x70 0x4A 0x08A3 w
-#VCS phase current to 30A C/C
-i2cset -y 4 0x12 0xFF 0x08 b    # set window register to 8
-i2cset -y 4 0x12 0x3C 0x3C b    # 30A
-i2cset -y 5 0x12 0xFF 0x08 b    # set window register to 8
-i2cset -y 5 0x12 0x3C 0x3C b    # 30A
-#VCS master OC to 43A
-i2cset -y 4 0x70 0x00 0x01 # PAGE 1
-i2cset -y 4 0x70 0x46 0x0816 w # OC to 43A
-i2cset -y 5 0x70 0x00 0x01 # PAGE 1
-i2cset -y 5 0x70 0x46 0x0816 w # OC to 43A
-
-# re-bind ucd driver only if we unbound it (i.e. ucd has been set with a value)
-if [ -e $ucdpath -a -n "$ucd" ]; then
-  j=0
-  until [ $j -ge $ucd_retries ] || [ -e $ucdpath/$ucd ]; do
-    j=$((j+1))
-    echo $ucd > $ucdpath/bind || ret=$?
-    if [ $j -gt 1 ]; then
-      echo "rebinding UCD driver. Retry number $j"
-      sleep 1
-    fi
-  done
-  if [ ! -e $ucdpath/$ucd ]; then exit $ret; fi
-fi
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service
deleted file mode 100644
index 74d8e4b..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Perform power workarounds on VRMs
-Wants=ir35221-on-unbind@%i.service
-After=ir35221-on-unbind@%i.service
-Before=avsbus-disable@%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env power-workarounds.sh
-SyslogIdentifier=power-workarounds.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
deleted file mode 100644
index c1d50e6..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
+++ /dev/null
@@ -1,24 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-INSTANCES = "motherboard/uuid motherboard/bmc/ethernet"
-ITEMS_FMT = "system/chassis/{0}"
-
-ITEMS = "${@compose_list(d, 'ITEMS_FMT', 'INSTANCES')}"
-
-ENV_FILES = "obmc/sync_inventory_item/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENV_FILES', 'ITEMS')}"
-
-TMPL = "obmc-sync-inventory-item@.service"
-TGT = "${SYSTEMD_DEFAULT_TARGET}"
-
-ETH_SVC = "system-chassis-motherboard-bmc-ethernet.service"
-UUID_SVC = "system-chassis-motherboard-uuid.service"
-
-ETH_DROPIN_DIR = "obmc-sync-inventory-item@${ETH_SVC}.d"
-UUID_DROPIN_DIR = "obmc-sync-inventory-item@${UUID_SVC}.d"
-
-SYSTEMD_OVERRIDE_${PN} += "mac_sync_inventory.conf:${ETH_DROPIN_DIR}/mac_sync_inventory.conf"
-SYSTEMD_OVERRIDE_${PN} += "uuid_sync_inventory.conf:${UUID_DROPIN_DIR}/uuid_sync_inventory.conf"
-
-SYSTEMD_LINK_${PN} += "../${TMPL}:${TGT}.wants/obmc-sync-inventory-item@${ETH_SVC}"
-SYSTEMD_LINK_${PN} += "../${TMPL}:${TGT}.wants/obmc-sync-inventory-item@${UUID_SVC}"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/mac_sync_inventory.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/mac_sync_inventory.conf
deleted file mode 100644
index f04b6dd..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/mac_sync_inventory.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Wants=mapper-wait@-xyz-openbmc_project-network-config.service
-After=mapper-wait@-xyz-openbmc_project-network-config.service
-
-Wants=op-vpd-parser.service
-After=op-vpd-parser.service
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/bmc/ethernet b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/bmc/ethernet
deleted file mode 100644
index 722e0e6..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/bmc/ethernet
+++ /dev/null
@@ -1,2 +0,0 @@
-PROPERTY="MACAddress"
-SYNC_TYPE=mac
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/uuid b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/uuid
deleted file mode 100644
index 95abbc8..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/uuid
+++ /dev/null
@@ -1,2 +0,0 @@
-PROPERTY="UUID"
-SYNC_TYPE=uuid
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/uuid_sync_inventory.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/uuid_sync_inventory.conf
deleted file mode 100644
index 5874762..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/uuid_sync_inventory.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Unit]
-Wants=op-vpd-parser.service
-After=op-vpd-parser.service
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control
deleted file mode 100644
index a93bdd7..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control
+++ /dev/null
@@ -1,2 +0,0 @@
-POLL_INTERVAL="500"
-PGOOD_TIMEOUT="10"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb
deleted file mode 100644
index d05e67f..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SUMMARY = "Witherspoon VRM Overrides"
-DESCRIPTION = "Sets Witherspoon VRMs to custom voltages"
-PR = "r1"
-
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
-
-RDEPENDS_${PN} += "i2c-tools bash"
-
-S = "${WORKDIR}"
-SRC_URI += "file://vrm-control.sh \
-            file://ir35221-unbind-bind.sh"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/vrm-control.sh ${D}${bindir}/vrm-control.sh
-        install -m 0755 ${WORKDIR}/ir35221-unbind-bind.sh ${D}${bindir}/ir35221-unbind-bind.sh
-}
-
-TMPL = "vrm-control@.service"
-INSTFMT = "vrm-control@{0}.service"
-TGTFMT_ON = "obmc-chassis-poweron@{0}.target"
-FMT_ON = "../${TMPL}:${TGTFMT_ON}.requires/${INSTFMT}"
-
-TMPL_ON_IRBIND = "ir35221-on-bind@.service"
-INSTFMT_ON_IRBIND = "ir35221-on-bind@{0}.service"
-FMT_ON_IRBIND = "../${TMPL_ON_IRBIND}:${TGTFMT_ON}.wants/${INSTFMT_ON_IRBIND}"
-
-TMPL_ON_IRUNBIND = "ir35221-on-unbind@.service"
-INSTFMT_ON_IRUNBIND = "ir35221-on-unbind@{0}.service"
-FMT_ON_IRUNBIND = "../${TMPL_ON_IRUNBIND}:${TGTFMT_ON}.requires/${INSTFMT_ON_IRUNBIND}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL} ${TMPL_ON_IRUNBIND} ${TMPL_ON_IRBIND}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON_IRBIND', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON_IRUNBIND', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-on-bind@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-on-bind@.service
deleted file mode 100644
index e6adc05..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-on-bind@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Power on bind ir35221 device driver devs
-After=avsbus-enable@%i.service
-Wants=obmc-host-start-pre@%i.target
-Before=obmc-host-start-pre@%i.target
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/ir35221-unbind-bind.sh bind
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-on-unbind@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-on-unbind@.service
deleted file mode 100644
index 7638538..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-on-unbind@.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=power on mode unbind ir35221 device driver devs
-Wants=obmc-power-start-pre@%i.target
-Before=obmc-power-start-pre@%i.target
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/ir35221-unbind-bind.sh unbind
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-unbind-bind.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-unbind-bind.sh
deleted file mode 100644
index 160cc5d..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-unbind-bind.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-# #########################################################
-# Script to run on witherspoon BMC to unbind/bind the ir35221
-# driver's devices
-
-status=0
-max_retries=3
-driver_path="/sys/bus/i2c/drivers/ir35221/"
-platform_path="/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/"
-
-unbind_driver () {
-    echo $1 > $driver_path/unbind
-}
-
-bind_driver () {
-    device=$1
-    tries=0
-
-    until [ $tries -ge $max_retries ]; do
-        tries=$((tries+1))
-        ret=0
-        echo $device > $driver_path/bind || ret=$?
-        if [ $ret -ne 0 ]; then
-            echo "VRM $1 bind failed. Try $tries"
-            sleep 1
-        else
-            tries=$((max_retries+1))
-        fi
-    done
-
-    #Script will return a nonzero value if any binds fail.
-    if [ $ret -ne 0 ]; then
-        status=$ret
-    fi
-}
-
-if [ "$1" = "unbind" ]
-then
-    if [ -e $driver_path/4-0070 ]
-    then
-        unbind_driver "4-0070"
-    fi
-
-    if [ -e $driver_path/4-0071 ]
-    then
-        unbind_driver "4-0071"
-    fi
-
-    if [ -e $driver_path/5-0070 ]
-    then
-        unbind_driver "5-0070"
-    fi
-
-    if [ -e $driver_path/5-0071 ]
-    then
-        unbind_driver "5-0071"
-    fi
-elif [ "$1" = "bind" ]
-then
-    if [ -e $platform_path/1e78a140.i2c-bus/i2c-4/4-0070 ]
-    then
-        bind_driver "4-0070"
-    fi
-
-    if [ -e $platform_path/1e78a140.i2c-bus/i2c-4/4-0071 ]
-    then
-        bind_driver "4-0071"
-    fi
-
-    if [ -e $platform_path/1e78a180.i2c-bus/i2c-5/5-0070 ]
-    then
-        bind_driver "5-0070"
-    fi
-
-    if [ -e $platform_path/1e78a180.i2c-bus/i2c-5/5-0071 ]
-    then
-        bind_driver "5-0071"
-    fi
-fi
-
-exit $status
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control.sh
deleted file mode 100644
index c67e244..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control.sh
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/bash
-# #########################################################
-# Script to run on witherspoon BMC to read/set vrm voltages
-
-
-# #########################################################
-d2v () {
-# usage:   d2v <decimal volts>
-
-echo $1 | awk '{print $1 * 256 + .5}' | cut -d '.' -f 1
-}
-
-
-# #########################################################
-v2d () {
-# usage:   v2d <hex val>
-
-printf "	%0.3fV" `echo $1 | awk '{print $1 / 256}'`
-}
-
-
-# #########################################################
-i2d () {
-# usage:  i2d <hex val> <current divisor>
-
-# parse current mantisa and exponent
-# format: SEEE ESMM MMMM MMMM
-let e=$1/0x800
-let esign=e/0x10
-let m=$1\&0x07FF
-let msign=m/0x0400
-
-if [ $msign -eq 1 ]
-then
-  # calc ones compliment
-  let m=($m^0x07FF)+1
-  m="-$m"
-fi
-if [ $esign -eq 1 ]
-then
-  # calc ones compliment
-  let e=(e^0x1F)+1
-  e="-$e"
-fi
-printf "	%0.3fA\n" `echo $m $e $2 | awk '{print ($1 * 2^$2)}'`
-}
-
-
-# #########################################################
-rw_vc () {
-# usage:   rw_vc <bus> <addr> <current divisor> <channel> <value>
-
-# select channel
-if [ $4 != "x" ]
-then
-  i2cset -y $1 $2 0 $4 b
-fi
-
-# write new voltage set point
-if [ ! -e $5 ]
-then
-  i2cset -y $1 $2 0x21 `d2v $5` w
-fi
-
-# print voltage set point
-v2d `i2cget -y $1 $2 0x21 w`
-
-# print voltage
-v2d `i2cget -y $1 $2 0x8B w`
-
-# print current
-i2d `i2cget -y $1 $2 0x8C w` $3
-
-# default back to channel 0
-if [ $4 != "x" ]
-then
-  i2cset -y $1 $2 0 0 b
-fi
-}
-
-
-# #########################################################
-# Main
-
-if [ -e $1 ]
-then
-  $0 vdda vcsa vdna vioa vddra vppa vddb vcsb vdnb viob vddrb vppb
-  exit
-fi
-
-if [ $1 == "-h" ]
-then
-  echo "  Usage: vrm [<rail>=[value] [<rail>=[value]] ...]"
-  echo "    rail: vdda vcsa vdna vioa vddra vppa vddb vcsb vdnb viob vddrb vppb vdnd viod"
-  echo "    value: volts"
-  echo
-  echo "    e.g., vrm vioa=1.0 viob=1.0"
-  echo
-  exit
-fi
-
-echo "rail	set	read	current"
-echo "-------	------- ------- -------"
-for param in ${@:1}
-do
-  rail=`echo $param | cut -d'=' -f 1`
-  val=`echo ${param}= | cut -d'=' -f 2`
-  echo -n "$rail"
-  case "$rail" in
-    vdda)
-      rw_vc 4 0x70 2 0 $val
-      ;;
-    vddb)
-      rw_vc 5 0x70 2 0 $val
-      ;;
-    vcsa)
-      rw_vc 4 0x70 4 1 $val
-      ;;
-    vcsb)
-      rw_vc 5 0x70 4 1 $val
-      ;;
-    vdna)
-      rw_vc 4 0x71 2 0 $val
-      ;;
-    vdnb)
-      rw_vc 5 0x71 2 0 $val
-      ;;
-    vioa)
-      rw_vc 4 0x40 2 x $val
-      ;;
-    viob)
-      rw_vc 5 0x40 2 x $val
-      ;;
-    vddra)
-      rw_vc 4 0x71 2 1 $val
-      ;;
-    vddrb)
-      rw_vc 5 0x71 2 1 $val
-      ;;
-    vppa)
-      rw_vc 12 0x41 2 x $val
-      ;;
-    vppb)
-      rw_vc 13 0x41 2 x $val
-      ;;
-    vdnd)
-      rw_vc 2 0x70 2 0 $val
-      ;;
-    viod)
-      rw_vc 2 0x70 2 1 $val
-      ;;
-    *)
-      echo "	non-existant"
-  esac
-done
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control@.service
deleted file mode 100644
index 731ce55..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Apply voltage overrides to VRMs
-Wants=avsbus-disable@%i.service
-After=avsbus-disable@%i.service
-Before=avsbus-enable@%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env vrm-control.sh vdna=0.9 vdnb=0.9
-SyslogIdentifier=vrm-control.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/obmc-console.conf
deleted file mode 100644
index a5ba3f3..0000000
--- a/meta-ibm/meta-witherspoon/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-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend
deleted file mode 100644
index ffe6b0c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_witherspoon := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native%.bbappend
deleted file mode 100644
index 2831afe..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " witherspoon-fan-policy-native"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " witherspoon-thermal-policy-native"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " witherspoon-power-supply-policy-native"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " witherspoon-events-policy-native"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor.bbappend
deleted file mode 100644
index e80b499..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-SYSTEMD_LINK_phosphor-msl-verify = "../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-mapper.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-mapper.bbappend
deleted file mode 100644
index 668ee93..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-mapper.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-MAPPER_SVC = "xyz.openbmc_project.ObjectMapper.service"
-
-MAPPER_DROPIN_DIR = "${MAPPER_SVC}.d"
-
-SYSTEMD_OVERRIDE_${PN} += "mapper-nice.conf:${MAPPER_DROPIN_DIR}/mapper-nice.conf"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-mapper/mapper-nice.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-mapper/mapper-nice.conf
deleted file mode 100644
index 5464cb5..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-mapper/mapper-nice.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-Nice=-5
\ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/events/witherspoon-events-policy-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/events/witherspoon-events-policy-native.bb
deleted file mode 100644
index c478e12..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/events/witherspoon-events-policy-native.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "Event policy for Witherspoon"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-inherit phosphor-dbus-monitor
-
-SRC_URI += "file://config.yaml"
-
-do_install() {
-        install -D ${WORKDIR}/config.yaml ${D}${config_dir}/config.yaml
-}
-
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/events/witherspoon-events-policy/config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/events/witherspoon-events-policy/config.yaml
deleted file mode 100644
index 0d31afb..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/events/witherspoon-events-policy/config.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-- name:  occpath group
-  class: group
-  group: path
-  members:
-    - meta: PATH
-      path: /org/open_power/control/occ0
-
-- name:  occproctemp property
-  class: group
-  group: property
-  type:  boolean
-  members:
-    - interface: org.open_power.OCC.Status
-      meta: PROPERTY
-      property: ThrottleProcTemp
-
-- name:  occprocpower property
-  class: group
-  group: property
-  type:  boolean
-  members:
-    - interface: org.open_power.OCC.Status
-      meta: PROPERTY
-      property: ThrottleProcPower
-
-- name:  occmemtemp property
-  class: group
-  group: property
-  type:  boolean
-  members:
-    - interface: org.open_power.OCC.Status
-      meta: PROPERTY
-      property: ThrottleMemTemp
-
-- name: watch occproctemp
-  class: watch
-  watch: property
-  paths: occpath group
-  properties: occproctemp property
-  callback: check occproctemp
-
-- name: watch occprocpower
-  class: watch
-  watch: property
-  paths: occpath group
-  properties: occprocpower property
-  callback: check occprocpower
-
-- name: watch occmemtemp
-  class: watch
-  watch: property
-  paths: occpath group
-  properties: occmemtemp property
-  callback: check occmemtemp
-
-- name: check occproctemp
-  class: condition
-  condition: count
-  paths: occpath group
-  properties: occproctemp property
-  defer: 1000us
-  callback: create occproctemp event
-  countop: '=='
-  countbound: 1
-  op: '=='
-  bound: true
-
-- name: check occprocpower
-  class: condition
-  condition: count
-  paths: occpath group
-  properties: occprocpower property
-  defer: 1000us
-  callback: create occprocpower event
-  countop: '=='
-  countbound: 1
-  op: '=='
-  bound: true
-
-- name: check occmemtemp
-  class: condition
-  condition: count
-  paths: occpath group
-  properties: occmemtemp property
-  defer: 1000us
-  callback: create occmemtemp event
-  countop: '=='
-  countbound: 1
-  op: '=='
-  bound: true
-
-- name: create occproctemp event
-  class: callback
-  callback: event
-  paths: occpath group
-  properties: occproctemp property
-  eventName: occ
-  eventMessage: "Processor throttled due to an over temperature condition."
-
-- name: create occprocpower event
-  class: callback
-  callback: event
-  paths: occpath group
-  properties: occprocpower property
-  eventName: occ
-  eventMessage: "Processor throttled due to reaching the power cap limit."
-
-- name: create occmemtemp event
-  class: callback
-  callback: event
-  paths: occpath group
-  properties: occmemtemp property
-  eventName: occ
-  eventMessage: "Memory throttled due to an over temperature condition."
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend
deleted file mode 100644
index 8cc310e..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend
+++ /dev/null
@@ -1,33 +0,0 @@
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-
-# Package configuration
-FAN_PACKAGES += " \
-        phosphor-cooling-type \
-"
-
-PACKAGECONFIG += "cooling-type"
-
-RDEPENDS_phosphor-cooling-type += "libevdev"
-
-TMPL_COOLING = "phosphor-cooling-type@.service"
-INSTFMT_COOLING = "phosphor-cooling-type@{0}.service"
-COOLING_TGT = "${SYSTEMD_DEFAULT_TARGET}"
-FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}"
-
-FILES_phosphor-cooling-type = "${sbindir}/phosphor-cooling-type"
-SYSTEMD_SERVICE_phosphor-cooling-type += "${TMPL_COOLING}"
-SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}"
-
-COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf"
-
-SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type += "${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}"
-
-#These services are protected by the watchdog
-SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf"
-
-#These services need to be stopped when watchdog expires
-SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf
deleted file mode 100644
index 90b1e81..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Unit]
-Conflicts=obmc-fan-watchdog-takeover.target
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf
deleted file mode 100644
index 023e61a..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-#These overrides allow the fan watchdog to take over when this service dies
-OnFailure=witherspoon-fan-watchdog-monitor@%n.service
-StartLimitIntervalSec=5
-StartLimitBurst=3
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf
deleted file mode 100644
index e5e8f43..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-OBJPATH="--path=/system/chassis"
-AIR="--air"
-WATER=""
-DEVICE="--dev=/dev/input/by-path/platform-gpio-keys-event"
-CODE="--event=13"
-
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service
deleted file mode 100644
index 9086efb..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Phosphor Cooling Type
-Wants=mapper-wait@-xyz-openbmc_project-inventory.service
-After=mapper-wait@-xyz-openbmc_project-inventory.service
-ConditionPathExists={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf
-ExecStart=/usr/bin/env phosphor-cooling-type ${{OBJPATH}} ${{AIR}} ${{WATER}} ${{DEVICE}} ${{CODE}}
-SyslogIdentifier=phosphor-cooling-type
-
-[Install]
-RequiredBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
deleted file mode 100644
index 1062023..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
+++ /dev/null
@@ -1,766 +0,0 @@
-groups:
-    - name: air_cooled_zone0_fans
-      description: Group of fan inventory objects for air cooled zone 0
-      type: /xyz/openbmc_project/inventory
-      members:
-          - /system/chassis/motherboard/fan0
-          - /system/chassis/motherboard/fan1
-          - /system/chassis/motherboard/fan2
-          - /system/chassis/motherboard/fan3
-    - name: water_and_air_cooled_zone0_fans
-      description: Group of fan inventory objects for water/air cooled zone 0
-      type: /xyz/openbmc_project/inventory
-      members:
-          - /system/chassis/motherboard/fan0
-          - /system/chassis/motherboard/fan2
-          - /system/chassis/motherboard/fan3
-    - name: zone0_ambient
-      description: Group of ambient temperature sensors for zone 0
-      type: /xyz/openbmc_project/sensors
-      members:
-          - /temperature/ambient
-    - name: occ0_object
-      description: Dbus object containing OCC0 properties
-      type: /org/open_power/control
-      members:
-          - /occ0
-    - name: occ1_object
-      description: Dbus object containing OCC1 properties
-      type: /org/open_power/control
-      members:
-          - /occ1
-    - name: zone0_cores
-      description: Group of core temperature sensors for zone 0
-      type: /xyz/openbmc_project/sensors
-      members:
-          - /temperature/p0_core0_temp
-          - /temperature/p0_core1_temp
-          - /temperature/p0_core2_temp
-          - /temperature/p0_core3_temp
-          - /temperature/p0_core4_temp
-          - /temperature/p0_core5_temp
-          - /temperature/p0_core6_temp
-          - /temperature/p0_core7_temp
-          - /temperature/p0_core8_temp
-          - /temperature/p0_core9_temp
-          - /temperature/p0_core10_temp
-          - /temperature/p0_core11_temp
-          - /temperature/p0_core12_temp
-          - /temperature/p0_core13_temp
-          - /temperature/p0_core14_temp
-          - /temperature/p0_core15_temp
-          - /temperature/p0_core16_temp
-          - /temperature/p0_core17_temp
-          - /temperature/p0_core18_temp
-          - /temperature/p0_core19_temp
-          - /temperature/p0_core20_temp
-          - /temperature/p0_core21_temp
-          - /temperature/p0_core22_temp
-          - /temperature/p0_core23_temp
-          - /temperature/p1_core0_temp
-          - /temperature/p1_core1_temp
-          - /temperature/p1_core2_temp
-          - /temperature/p1_core3_temp
-          - /temperature/p1_core4_temp
-          - /temperature/p1_core5_temp
-          - /temperature/p1_core6_temp
-          - /temperature/p1_core7_temp
-          - /temperature/p1_core8_temp
-          - /temperature/p1_core9_temp
-          - /temperature/p1_core10_temp
-          - /temperature/p1_core11_temp
-          - /temperature/p1_core12_temp
-          - /temperature/p1_core13_temp
-          - /temperature/p1_core14_temp
-          - /temperature/p1_core15_temp
-          - /temperature/p1_core16_temp
-          - /temperature/p1_core17_temp
-          - /temperature/p1_core18_temp
-          - /temperature/p1_core19_temp
-          - /temperature/p1_core20_temp
-          - /temperature/p1_core21_temp
-          - /temperature/p1_core22_temp
-          - /temperature/p1_core23_temp
-    - name: zone0_regulators
-      description: Group of regulator temperature sensors for zone 0
-      type: /xyz/openbmc_project/sensors
-      members:
-          - /temperature/p0_vdd_temp
-          - /temperature/p1_vdd_temp
-    - name: zone0_dimms
-      description: Group of dimm temperature sensors for zone 0
-      type: /xyz/openbmc_project/sensors
-      members:
-          - /temperature/dimm0_temp
-          - /temperature/dimm1_temp
-          - /temperature/dimm2_temp
-          - /temperature/dimm3_temp
-          - /temperature/dimm4_temp
-          - /temperature/dimm5_temp
-          - /temperature/dimm6_temp
-          - /temperature/dimm7_temp
-          - /temperature/dimm8_temp
-          - /temperature/dimm9_temp
-          - /temperature/dimm10_temp
-          - /temperature/dimm11_temp
-          - /temperature/dimm12_temp
-          - /temperature/dimm13_temp
-          - /temperature/dimm14_temp
-          - /temperature/dimm15_temp
-    - name: zone0_gpu_cores
-      description: Group of gpu core temperature sensors for zone 0
-      type: /xyz/openbmc_project/sensors
-      members:
-          - /temperature/gpu0_core_temp
-          - /temperature/gpu1_core_temp
-          - /temperature/gpu2_core_temp
-          - /temperature/gpu3_core_temp
-          - /temperature/gpu4_core_temp
-          - /temperature/gpu5_core_temp
-    - name: zone0_gpu_memory
-      description: Group of gpu memory temperature sensors for zone 0
-      type: /xyz/openbmc_project/sensors
-      members:
-          - /temperature/gpu0_mem_temp
-          - /temperature/gpu1_mem_temp
-          - /temperature/gpu2_mem_temp
-          - /temperature/gpu3_mem_temp
-          - /temperature/gpu4_mem_temp
-          - /temperature/gpu5_mem_temp
-    - name: zone0_pcie
-      description: Group of pcie temperature sensors for zone 0
-      type: /xyz/openbmc_project/sensors
-      members:
-          - /temperature/pcie
-
-matches:
-    - name: propertiesChanged
-      description: >
-          A property changed match
-      parameters:
-          - object
-          - interface
-      signal: propertySignal
-    - name: interfacesAdded
-      description: >
-          An interfaces added match
-      parameters:
-          - object
-      signal: objectSignal
-    - name: interfacesRemoved
-      description: >
-          An interfaces removed match
-      parameters:
-          - object
-      signal:
-          name: objectSignal
-          parameters:
-              - object
-              - interface
-          handler: removeInterface
-    - name: nameOwnerChanged
-      description: >
-          A name owner changed match
-      parameters:
-          - object
-          - interface
-      signal: ownerSignal
-
-signals:
-    - name: propertySignal
-      description: >
-          Handle property signals
-      parameters:
-          - type
-          - object
-          - interface
-          - property
-      handler: setProperty
-    - name: objectSignal
-      description: >
-          Handle object signals
-      parameters:
-          - type
-          - object
-          - interface
-          - property
-      handler: setProperty
-    - name: ownerSignal
-      description: >
-          Handle owner signals
-      parameters:
-          - object
-          - interface
-      handler: setService
-
-handlers:
-    - name: setProperty
-      description: >
-          Sets a value for the given object/interface/property
-      parameters:
-          - type
-          - object
-          - interface
-          - property
-    - name: setService
-      description: >
-          Sets the service name(s) for the given group
-      parameters:
-          - group
-    - name: removeInterface
-      description: >
-          Removes an interface(and all associated properties) on the
-          given object from use within actions
-      parameters:
-          - object
-          - interface
-
-preconditions:
-    - name: property_states_match
-      description: >
-          All defined properties must match the values given to
-          enable a set speed event otherwise fan speeds are set to full
-      parameters:
-          - groups
-
-actions:
-    - name: call_actions_based_on_timer
-      description: >
-          Sets up a list of actions to be invoked when the defined timer
-          expires (or for each expiration of a repeating timer)
-      parameters:
-          - timer
-          - actions
-    - name: default_floor_on_missing_owner
-      description: >
-          Set the fan floor to the default floor
-    - name: set_speed_on_missing_owner
-      description: >
-          Set fans to the given speed when any service within the group
-          no longer exists
-      parameters:
-          - speed
-    - name: set_request_speed_base_with_max
-      description: >
-          Set the base request speed of a zone to the max value of a group for
-          calculating a new target speed
-    - name: count_state_before_speed
-      description: Set the speed when a number of properties at a state
-      parameters:
-          - count
-          - property
-          - speed
-    - name: set_floor_from_average_sensor_value
-      description: Set floor speed from first entry with average less than key
-      parameters:
-          - map
-    - name: set_ceiling_from_average_sensor_value
-      description: Set ceiling speed based on key transition values with average
-      parameters:
-          - map
-    - name: set_net_increase_speed
-      description: >
-          Set the speed increase delta based on a factor applied to
-          the delta increase size times the given value and property's
-          value difference
-      parameters:
-          - property
-          - factor
-          - delta
-    - name: set_net_decrease_speed
-      description: >
-          Set the speed decrease delta based on a factor applied to
-          the delta decrease size times the given value and property's
-          value difference
-      parameters:
-          - property
-          - factor
-          - delta
-
-events:
-    - name: default_fan_floor_on_service_fail
-      # No global zone conditions defined == all unless defined on group
-      groups:
-          - name: zone0_ambient
-            interface: xyz.openbmc_project.Sensor.Value
-            property:
-                name: Value
-                type: int64_t
-      matches:
-          - name: nameOwnerChanged
-      actions:
-          - name: call_actions_based_on_timer
-            timer:
-                delay: 5
-                type: oneshot
-            actions:
-                - name: default_floor_on_missing_owner
-    - name: high_speed_on_occ0_service_fail
-      # No global zone conditions defined == all unless defined on group
-      groups:
-          - name: occ0_object
-            interface: org.open_power.OCC.Status
-            property:
-                name: OccActive
-                type: bool
-      matches:
-          - name: nameOwnerChanged
-      actions:
-          - name: call_actions_based_on_timer
-            timer:
-                delay: 5
-                type: oneshot
-            actions:
-                - name: set_speed_on_missing_owner
-                  speed:
-                      value: 10500
-                      type: uint64_t
-    - name: high_speed_on_occ1_service_fail
-      # No global zone conditions defined == all unless defined on group
-      groups:
-          - name: occ1_object
-            interface: org.open_power.OCC.Status
-            property:
-                name: OccActive
-                type: bool
-      matches:
-          - name: nameOwnerChanged
-      actions:
-          - name: call_actions_based_on_timer
-            timer:
-                delay: 5
-                type: oneshot
-            actions:
-                - name: set_speed_on_missing_owner
-                  speed:
-                      value: 10500
-                      type: uint64_t
-    - name: missing_before_high_speed_air
-      groups:
-          - name: air_cooled_zone0_fans
-            zone_conditions:
-                - name: air_cooled_chassis
-                  zones:
-                      - 0
-            interface: xyz.openbmc_project.Inventory.Item
-            property:
-                name: Present
-                type: bool
-      matches:
-          - name: propertiesChanged
-      actions:
-          - name: count_state_before_speed
-            count: 1
-            property:
-                value: false
-                type: bool
-            speed:
-                value: 10500
-                type: uint64_t
-    - name: fails_before_high_speed_air
-      groups:
-          - name: air_cooled_zone0_fans
-            zone_conditions:
-                - name: air_cooled_chassis
-                  zones:
-                      - 0
-            interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-            property:
-                name: Functional
-                type: bool
-      matches:
-          - name: interfacesAdded
-          - name: propertiesChanged
-      actions:
-          - name: count_state_before_speed
-            count: 1
-            property:
-                value: false
-                type: bool
-            speed:
-                value: 10500
-                type: uint64_t
-    - name: missing_before_high_speed_water_and_air
-      groups:
-          - name: water_and_air_cooled_zone0_fans
-            zone_conditions:
-                - name: water_and_air_cooled_chassis
-                  zones:
-                      - 0
-            interface: xyz.openbmc_project.Inventory.Item
-            property:
-                name: Present
-                type: bool
-      matches:
-          - name: propertiesChanged
-      actions:
-          - name: count_state_before_speed
-            count: 1
-            property:
-                value: false
-                type: bool
-            speed:
-                value: 10500
-                type: uint64_t
-    - name: fails_before_high_speed_water_and_air
-      groups:
-          - name: water_and_air_cooled_zone0_fans
-            zone_conditions:
-                - name: water_and_air_cooled_chassis
-                  zones:
-                      - 0
-            interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-            property:
-                name: Functional
-                type: bool
-      matches:
-          - name: interfacesAdded
-          - name: propertiesChanged
-      actions:
-          - name: count_state_before_speed
-            count: 1
-            property:
-                value: false
-                type: bool
-            speed:
-                value: 10500
-                type: uint64_t
-    - name: set_air_cooled_speed_boundaries_based_on_ambient
-      groups:
-          - name: zone0_ambient
-            zone_conditions:
-                - name: air_cooled_chassis
-                  zones:
-                      - 0
-            interface: xyz.openbmc_project.Sensor.Value
-            property:
-                name: Value
-                type: int64_t
-      matches:
-          - name: propertiesChanged
-      actions:
-          - name: set_floor_from_average_sensor_value
-            map:
-                value:
-                    - 27000: 3500
-                    - 32000: 4600
-                    - 37000: 5200
-                    - 40000: 5800
-                type: std::map<int64_t, uint64_t>
-          - name: set_ceiling_from_average_sensor_value
-            map:
-                value:
-                    - 25000: 7200
-                    - 27000: 10500
-                type: std::map<int64_t, uint64_t>
-    - name: set_water_cooled_speed_boundaries_based_on_ambient
-      groups:
-          - name: zone0_ambient
-            zone_conditions:
-                - name: water_and_air_cooled_chassis
-                  zones:
-                      - 0
-            interface: xyz.openbmc_project.Sensor.Value
-            property:
-                name: Value
-                type: int64_t
-      matches:
-          - name: propertiesChanged
-      actions:
-          - name: set_floor_from_average_sensor_value
-            map:
-                value:
-                    - 27000: 3000
-                    - 32000: 4300
-                    - 37000: 5000
-                    - 40000: 5800
-                type: std::map<int64_t, uint64_t>
-          - name: set_ceiling_from_average_sensor_value
-            map:
-                value:
-                    - 25000: 7200
-                    - 27000: 10500
-                type: std::map<int64_t, uint64_t>
-    - name: speed_changes_based_on_regulator_temps
-      # No global zone conditions defined == all unless defined on group
-      groups:
-          - name: zone0_regulators
-            interface: xyz.openbmc_project.Sensor.Value
-            property:
-                name: Value
-                type: int64_t
-      matches:
-          - name: interfacesAdded
-          - name: propertiesChanged
-      actions:
-          - name: set_net_increase_speed
-            property:
-                value: 85000
-                type: int64_t
-            factor:
-                value: 1000
-                type: int64_t
-            delta:
-                value: 400
-                type: uint64_t
-          - name: set_net_decrease_speed
-            property:
-                value: 82000
-                type: int64_t
-            factor:
-                value: 1000
-                type: int64_t
-            delta:
-                value: 40
-                type: uint64_t
-      timer:
-          interval: 5
-    - name: speed_changes_based_on_pcie_temps
-      # No global zone conditions defined == all unless defined on group
-      groups:
-          - name: zone0_pcie
-            interface: xyz.openbmc_project.Sensor.Value
-            property:
-                name: Value
-                type: int64_t
-      matches:
-          - name: interfacesAdded
-          - name: propertiesChanged
-      actions:
-          - name: set_net_increase_speed
-            property:
-                value: 55000
-                type: int64_t
-            factor:
-                value: 1000
-                type: int64_t
-            delta:
-                value: 400
-                type: uint64_t
-          - name: set_net_decrease_speed
-            property:
-                value: 52000
-                type: int64_t
-            factor:
-                value: 1000
-                type: int64_t
-            delta:
-                value: 40
-                type: uint64_t
-      timer:
-          interval: 5
-    - name: occ_active_speed_changes
-      precondition:
-          name: property_states_match
-          groups:
-              - name: occ0_object
-                interface: org.open_power.OCC.Status
-                property:
-                    name: OccActive
-                    type: bool
-                    value: true
-              - name: occ1_object
-                interface: org.open_power.OCC.Status
-                property:
-                    name: OccActive
-                    type: bool
-                    value: true
-          matches:
-              - name: interfacesAdded
-              - name: propertiesChanged
-          events:
-              - name: fails_before_high_speed_air
-                groups:
-                    - name: zone0_cores
-                      zone_conditions:
-                          - name: air_cooled_chassis
-                            zones:
-                                - 0
-                      interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-                      property:
-                          name: Functional
-                          type: bool
-                    - name: zone0_dimms
-                      interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-                      property:
-                          name: Functional
-                          type: bool
-                    - name: zone0_gpu_cores
-                      zone_conditions:
-                          - name: air_cooled_chassis
-                            zones:
-                                - 0
-                      interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-                      property:
-                          name: Functional
-                          type: bool
-                    - name: zone0_gpu_memory
-                      zone_conditions:
-                          - name: air_cooled_chassis
-                            zones:
-                                - 0
-                      interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-                      property:
-                          name: Functional
-                          type: bool
-                matches:
-                    - name: interfacesAdded
-                    - name: propertiesChanged
-                actions:
-                    - name: count_state_before_speed
-                      count: 1
-                      property:
-                          value: false
-                          type: bool
-                      speed:
-                          value: 10500
-                          type: uint64_t
-              - name: speed_changes_based_on_core_temps
-                groups:
-                    - name: zone0_cores
-                      zone_conditions:
-                          - name: air_cooled_chassis
-                            zones:
-                                - 0
-                      interface: xyz.openbmc_project.Sensor.Value
-                      property:
-                          name: Value
-                          type: int64_t
-                matches:
-                    - name: interfacesAdded
-                    - name: propertiesChanged
-                    - name: interfacesRemoved
-                actions:
-                    - name: set_net_increase_speed
-                      property:
-                          value: 73000
-                          type: int64_t
-                      factor:
-                          value: 1000
-                          type: int64_t
-                      delta:
-                          value: 400
-                          type: uint64_t
-                    - name: set_net_decrease_speed
-                      property:
-                          value: 70000
-                          type: int64_t
-                      factor:
-                          value: 1000
-                          type: int64_t
-                      delta:
-                          value: 40
-                          type: uint64_t
-                timer:
-                    interval: 5
-              - name: speed_changes_based_on_dimm_temps
-                # No global zone conditions defined == all unless defined on group
-                groups:
-                    - name: zone0_dimms
-                      interface: xyz.openbmc_project.Sensor.Value
-                      property:
-                          name: Value
-                          type: int64_t
-                matches:
-                    - name: interfacesAdded
-                    - name: propertiesChanged
-                    - name: interfacesRemoved
-                actions:
-                    - name: set_net_increase_speed
-                      property:
-                          value: 64000
-                          type: int64_t
-                      factor:
-                          value: 1000
-                          type: int64_t
-                      delta:
-                          value: 200
-                          type: uint64_t
-                    - name: set_net_decrease_speed
-                      property:
-                          value: 61000
-                          type: int64_t
-                      factor:
-                          value: 1000
-                          type: int64_t
-                      delta:
-                          value: 40
-                          type: uint64_t
-                timer:
-                    interval: 5
-              - name: speed_changes_based_on_gpu_core_temps
-                groups:
-                    - name: zone0_gpu_cores
-                      zone_conditions:
-                          - name: air_cooled_chassis
-                            zones:
-                                - 0
-                      interface: xyz.openbmc_project.Sensor.Value
-                      property:
-                          name: Value
-                          type: int64_t
-                matches:
-                    - name: interfacesAdded
-                    - name: propertiesChanged
-                    - name: interfacesRemoved
-                actions:
-                    - name: set_net_increase_speed
-                      property:
-                          value: 78000
-                          type: int64_t
-                      factor:
-                          value: 1000
-                          type: int64_t
-                      delta:
-                          value: 600
-                          type: uint64_t
-                    - name: set_net_decrease_speed
-                      property:
-                          value: 75000
-                          type: int64_t
-                      factor:
-                          value: 1000
-                          type: int64_t
-                      delta:
-                          value: 40
-                          type: uint64_t
-                timer:
-                    interval: 5
-              - name: speed_changes_based_on_gpu_memory_temps
-                groups:
-                    - name: zone0_gpu_memory
-                      zone_conditions:
-                          - name: air_cooled_chassis
-                            zones:
-                                - 0
-                      interface: xyz.openbmc_project.Sensor.Value
-                      property:
-                          name: Value
-                          type: int64_t
-                matches:
-                    - name: interfacesAdded
-                    - name: propertiesChanged
-                    - name: interfacesRemoved
-                actions:
-                    - name: set_net_increase_speed
-                      property:
-                          value: 80000
-                          type: int64_t
-                      factor:
-                          value: 1000
-                          type: int64_t
-                      delta:
-                          value: 600
-                          type: uint64_t
-                    - name: set_net_decrease_speed
-                      property:
-                          value: 77000
-                          type: int64_t
-                      factor:
-                          value: 1000
-                          type: int64_t
-                      delta:
-                          value: 40
-                          type: uint64_t
-                timer:
-                    interval: 5
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml
deleted file mode 100755
index a70ac85..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-fans:
-  - inventory: /system/chassis/motherboard/fan2
-    cooling_zone: 0
-    cooling_profile: all
-    sensors:
-      - fan2_0
-  - inventory: /system/chassis/motherboard/fan0
-    cooling_zone: 0
-    cooling_profile: all
-    sensors:
-      - fan0_0
-  - inventory: /system/chassis/motherboard/fan1
-    cooling_zone: 0
-    cooling_profile: air
-    sensors:
-      - fan1_0
-  - inventory: /system/chassis/motherboard/fan3
-    cooling_zone: 0
-    cooling_profile: all
-    sensors:
-      - fan3_0
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native/zone_conditions.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native/zone_conditions.yaml
deleted file mode 100644
index 0c8b3c5..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native/zone_conditions.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-conditions:
-  - name: air_cooled_chassis
-    type: getProperty
-    properties:
-      - property: WaterCooled
-        interface: xyz.openbmc_project.Inventory.Decorator.CoolingType
-        path: /xyz/openbmc_project/inventory/system/chassis
-        type: bool
-        value: false
-
-  - name: water_and_air_cooled_chassis
-    type: getProperty
-    properties:
-      - property: WaterCooled
-        interface: xyz.openbmc_project.Inventory.Decorator.CoolingType
-        path: /xyz/openbmc_project/inventory/system/chassis
-        type: bool
-        value: true
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend
deleted file mode 100644
index 6d4804d..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml
deleted file mode 100644
index 29dd2c7..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-manager_configuration:
-  power_on_delay: 20
-
-zone_configuration:
-
-#Air cooled zones
-- zone_conditions:
-  - name: air_cooled_chassis
-
-  zones:
-    - zone: 0
-      cooling_profiles:
-      - air
-      - all
-      full_speed: 10500
-      default_floor: 8000
-      increase_delay: 5
-      decrease_interval: 30
-
-#Water cooled zones
-- zone_conditions:
-  - name: water_and_air_cooled_chassis
-
-  zones:
-    - zone: 0
-      cooling_profiles:
-      - water
-      - all
-      full_speed: 10500
-      default_floor: 8000
-      increase_delay: 5
-      decrease_interval: 30
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
deleted file mode 100644
index 5db7966..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-fans:
-  - inventory: /system/chassis/motherboard/fan0
-    functional_delay: 5
-    allowed_out_of_range_time: 30
-    deviation: 15
-    num_sensors_nonfunc_for_fan_nonfunc: 1
-    sensors:
-      - name: fan0_0
-        has_target: true
-      - name: fan0_1
-        has_target: false
-
-  - inventory: /system/chassis/motherboard/fan1
-    functional_delay: 5
-    allowed_out_of_range_time: 30
-    deviation: 15
-    num_sensors_nonfunc_for_fan_nonfunc: 1
-    sensors:
-      - name: fan1_0
-        has_target: true
-      - name: fan1_1
-        has_target: false
-    # Create fan1 inventory & sensors on air cooled only
-    condition:
-      name: propertiesMatch
-      properties:
-        - object: /xyz/openbmc_project/inventory/system/chassis
-          interface: xyz.openbmc_project.Inventory.Decorator.CoolingType
-          property:
-              name: WaterCooled
-              type: bool
-              value: false
-
-  - inventory: /system/chassis/motherboard/fan2
-    functional_delay: 5
-    allowed_out_of_range_time: 30
-    deviation: 15
-    num_sensors_nonfunc_for_fan_nonfunc: 1
-    sensors:
-      - name: fan2_0
-        has_target: true
-      - name: fan2_1
-        has_target: false
-
-  - inventory: /system/chassis/motherboard/fan3
-    functional_delay: 5
-    allowed_out_of_range_time: 30
-    deviation: 15
-    num_sensors_nonfunc_for_fan_nonfunc: 1
-    sensors:
-      - name: fan3_0
-        has_target: true
-      - name: fan3_1
-        has_target: false
-
-sensor_trust_groups:
-  - class: NonzeroSpeed
-    group:
-        # Include all _1 fans to determine trust
-      - name: fan0_1
-      - name: fan1_1
-      - name: fan2_1
-      - name: fan3_1
-        # Add all _0 fans to be included in trust result effects,
-        # but not in determining trust
-      - name: fan0_0
-        in_trust: false
-      - name: fan1_0
-        in_trust: false
-      - name: fan2_0
-        in_trust: false
-      - name: fan3_0
-        in_trust: false
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml
deleted file mode 100644
index c5be29c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- name: fan0
-  path: /system/chassis/motherboard/fan0
-  methods:
-    - type: gpio
-      key: 4
-      physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060
-      devpath: /dev/input/by-path/platform-gpio-keys-polled-event
-    - type: tach
-      sensors:
-        - fan0_0
-        - fan0_1
-  rpolicy:
-    type: anyof
-
-- name: fan1
-  path: /system/chassis/motherboard/fan1
-  methods:
-    - type: gpio
-      key: 5
-      physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060
-      devpath: /dev/input/by-path/platform-gpio-keys-polled-event
-    - type: tach
-      sensors:
-        - fan1_0
-        - fan1_1
-  rpolicy:
-    type: anyof
-
-- name: fan2
-  path: /system/chassis/motherboard/fan2
-  methods:
-    - type: gpio
-      key: 6
-      physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060
-      devpath: /dev/input/by-path/platform-gpio-keys-polled-event
-    - type: tach
-      sensors:
-        - fan2_0
-        - fan2_1
-  rpolicy:
-    type: anyof
-
-- name: fan3
-  path: /system/chassis/motherboard/fan3
-  methods:
-    - type: gpio
-      key: 7
-      physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060
-      devpath: /dev/input/by-path/platform-gpio-keys-polled-event
-    - type: tach
-      sensors:
-        - fan3_0
-        - fan3_1
-  rpolicy:
-    type: anyof
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy-native.bb
deleted file mode 100644
index b7da45c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy-native.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SUMMARY = "Fan policy for Witherspoon"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-inherit phosphor-dbus-monitor
-
-SRC_URI += "file://air-cooled.yaml"
-SRC_URI += "file://water-cooled.yaml"
-SRC_URI += "file://fan-errors.yaml"
-
-do_install() {
-        install -D ${WORKDIR}/air-cooled.yaml ${D}${config_dir}/air-cooled.yaml
-        install -D ${WORKDIR}/water-cooled.yaml ${D}${config_dir}/water-cooled.yaml
-        install -D ${WORKDIR}/fan-errors.yaml ${D}${config_dir}/fan-errors.yaml
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/air-cooled.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/air-cooled.yaml
deleted file mode 100644
index d60aa91..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/air-cooled.yaml
+++ /dev/null
@@ -1,328 +0,0 @@
-# Air cooled Witherspoon fan policy for PDM.
-#
-# An air cooled Witherspoon requires a minimum of three functional fans
-# enclosures or six functional fan rotors across all enclosures.
-# If the number of functional fan enclosures is below three, soft poweroff
-# the system, whereas if the number of fan rotors drop below six, an
-# immediate hard poweroff of the system occurs.
-
-- name: fan enclosures
-  description: >
-    'An air cooled Witherspoon has four fan enclosures to monitor.'
-  class: group
-  group: path
-  members:
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan1
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3
-
-- name: fan rotors
-  description: >
-    'An air cooled Witherspoon has eight fan rotors to monitor.'
-  class: group
-  group: path
-  members:
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_0
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_1
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_0
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_1
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_0
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_1
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3/fan3_0
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3/fan3_1
-
-- name: chassis state
-  description: >
-    'Witherspoon has a single chassis to monitor.'
-  class: group
-  group: path
-  members:
-    - meta: CHASSISSTATE
-      path: /xyz/openbmc_project/state/chassis0
-
-- name: chassis
-  description: >
-    'Witherspoon has a single chassis to monitor.'
-  class: group
-  group: path
-  members:
-    - meta: CHASSIS
-      path: /xyz/openbmc_project/inventory/system/chassis
-
-- name: fan present
-  description: >
-    'Monitor the presence state of each fan.'
-  class: group
-  group: property
-  type: boolean
-  members:
-    - interface: xyz.openbmc_project.Inventory.Item
-      meta: PRESENT
-      property: Present
-
-- name: fan functional
-  description: >
-    'Monitor the functional state of each fan.'
-  class: group
-  group: property
-  type: boolean
-  members:
-    - interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-      meta: FUNCTIONAL
-      property: Functional
-
-- name: chassis powered
-  description: >
-    'Monitor the chassis power state.'
-  class: group
-  group: property
-  type: string
-  members:
-    - interface: xyz.openbmc_project.State.Chassis
-      meta: CHASSIS_STATE
-      property: CurrentPowerState
-
-- name: chassis air cooled
-  description: >
-    'Monitor the chassis cooling type.'
-  class: group
-  group: property
-  type: boolean
-  members:
-    - interface: xyz.openbmc_project.Inventory.Decorator.CoolingType
-      meta: COOLING_TYPE
-      property: WaterCooled
-
-- name: watch fan present
-  description: >
-    'Trigger logic on fan enclosure presence state changes.'
-  class: watch
-  watch: property
-  paths: fan enclosures
-  properties: fan present
-  callback: check cooling type
-
-- name: watch fan functional
-  description: >
-    'Trigger logic on fan enclosure functional state changes.'
-  class: watch
-  watch: property
-  paths: fan enclosures
-  properties: fan functional
-  callback: check cooling type
-
-- name: watch fan rotor functional
-  description: >
-    'Trigger logic on fan rotor functional state changes.'
-  class: watch
-  watch: property
-  paths: fan rotors
-  properties: fan functional
-  callback: check cooling type
-
-- name: watch chassis state
-  description: >
-    'Trigger logic on chassis power state changes.'
-  class: watch
-  watch: property
-  paths: chassis state
-  properties: chassis powered
-  callback: check cooling type
-
-- name: watch cooling type
-  description: >
-    'Maintain a cache of the chassis cooling type.'
-  class: watch
-  watch: property
-  paths: chassis
-  properties: chassis air cooled
-
-- name: check cooling type
-  description: >
-    'If this condition passes the chassis is air cooled.'
-  class: condition
-  condition: count
-  paths: chassis
-  properties: chassis air cooled
-  callback: check power
-  countop: '=='
-  countbound: 0
-  op: '=='
-  bound: true
-
-- name: check power
-  description: >
-    'If the chassis has power, check fans.'
-  class: condition
-  condition: count
-  paths: chassis state
-  properties: chassis powered
-  callback: check fans
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: xyz.openbmc_project.State.Chassis.PowerState.On
-
-- name: check fans
-  description: >
-    'Verify there are at least three functional fan enclosures and at least
-    six functional fan rotors, power off if not.'
-  class: callback
-  callback: group
-  members:
-    - check group presence
-    - check group functional enclosures
-    - check group functional rotors
-
-- name: check group presence
-  description: >
-    'If this condition passes more than one fan has been unplugged
-    for more than 25 seconds.  Shut the system down.  Count present
-    fans rather than non-present fans since the latter would pass
-    if the fan has not been created for some reason.
-
-    For a more detailed definition of unplugged, consult the documentation
-    of xyz.openbmc_project.Inventory.Item and/or the documentation
-    of the fan inventory object implementation.'
-  class: condition
-  condition: count
-  paths: fan enclosures
-  properties: fan present
-  defer: 25000000us
-  callback: log and shutdown
-  countop: '<'
-  countbound: 3
-  op: '=='
-  bound: true
-
-- name: check group functional enclosures
-  description: >
-    'If this condition passes more than one fan enclosure in the group has been
-    marked as nonfunctional for five seconds.  Shut the system down.
-
-    For a more detailed definition of nonfunctional, consult the documentation
-    of xyz.openbmc_project.State.Decorator.OperationalStatus and/or the
-    documentation of the fan inventory object implementation.'
-  class: condition
-  condition: count
-  paths: fan enclosures
-  properties: fan functional
-  defer: 5000000us
-  callback: log and shutdown
-  countop: '>'
-  countbound: 1
-  op: '=='
-  bound: false
-
-- name: check group functional rotors
-  description: >
-    'If this condition passes more than two fan rotors in the group have been
-    marked as nonfunctional for five seconds.  Immediately power off.
-
-    For a more detailed definition of nonfunctional, consult the documentation
-    of xyz.openbmc_project.State.Decorator.OperationalStatus and/or the
-    documentation of the fan inventory object implementation.'
-  class: condition
-  condition: count
-  paths: fan rotors
-  properties: fan functional
-  defer: 5000000us
-  callback: log and poweroff
-  countop: '>'
-  countbound: 2
-  op: '=='
-  bound: false
-
-- name: log and poweroff
-  description: >
-    'Immediately poweroff, log an event in the journal, and create an
-     error log.'
-  class: callback
-  callback: group
-  members:
-    - hard poweroff
-    - log hard poweroff
-    - create shutdown error
-
-- name: log and shutdown
-  description: >
-    'Shut the system down, log an event in the journal, and create an
-     error log.'
-  class: callback
-  callback: group
-  members:
-    - shutdown
-    - log shutdown
-    - create shutdown error
-
-- name: hard poweroff
-  description: >
-    'Immediately power off the system.'
-  class: callback
-  callback: method
-  service: org.freedesktop.systemd1
-  path: /org/freedesktop/systemd1
-  interface: org.freedesktop.systemd1.Manager
-  method: StartUnit
-  args:
-    - value: obmc-chassis-hard-poweroff@0.target
-      type: string
-    - value: replace
-      type: string
-
-- name: shutdown
-  description: >
-    'Shut down the system.'
-  class: callback
-  callback: method
-  service: org.freedesktop.systemd1
-  path: /org/freedesktop/systemd1
-  interface: org.freedesktop.systemd1.Manager
-  method: StartUnit
-  args:
-    - value: obmc-host-shutdown@0.target
-      type: string
-    - value: replace
-      type: string
-
-- name: log hard poweroff
-  description: >
-    'Log a hard poweroff event to the systemd journal.'
-  class: callback
-  callback: journal
-  paths: chassis state
-  properties: chassis powered
-  severity: ERR
-  message: Immediate poweroff of system. There are not enough functional fans.
-
-- name: log shutdown
-  description: >
-    'Log a shutdown event to the systemd journal.'
-  class: callback
-  callback: journal
-  paths: chassis state
-  properties: chassis powered
-  severity: ERR
-  message: Request shutdown of system. There are not enough functional fans.
-
-- name: create shutdown error
-  description: >
-    'Create a Fan Shutdown Error log.'
-  class: callback
-  callback: elog
-  paths: chassis state
-  properties: chassis powered
-  error: xyz::openbmc_project::State::Shutdown::Inventory::Error::Fan
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/fan-errors.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/fan-errors.yaml
deleted file mode 100644
index 0c14627..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/fan-errors.yaml
+++ /dev/null
@@ -1,676 +0,0 @@
-# Witherspoon fan error policy for PDM.
-#
-# * Create a NotPresent error if fan 0, 1, 2, or 3 is not present for more
-#   than 20 seconds.
-# * Create a Nonfunctional error if fan 0, 1, 2, or 3 is not
-#   functional for any amount of time.
-#
-# The system must be powered on in both of these cases.
-# If a water cooled system, don't create errors for fan 1.
-# Note: An error is created each time the chassis powers on.
-#
-# * Watch for fans to become both present and functional, and then resolve
-#   their errors
-
-- name: fan0
-  class: group
-  group: path
-  members:
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0
-
-- name: fan1
-  class: group
-  group: path
-  members:
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan1
-
-- name: fan2
-  class: group
-  group: path
-  members:
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2
-
-- name: fan3
-  class: group
-  group: path
-  members:
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3
-
-- name: chassis state
-  description: >
-    'Witherspoon has a single chassis to monitor.'
-  class: group
-  group: path
-  members:
-    - meta: CHASSISSTATE
-      path: /xyz/openbmc_project/state/chassis0
-
-- name: chassis
-  description: >
-    'Witherspoon has a single chassis to monitor.'
-  class: group
-  group: path
-  members:
-    - meta: CHASSIS
-      path: /xyz/openbmc_project/inventory/system/chassis
-
-
-- name: fan present
-  description: >
-    'Monitor the presence state of each fan.'
-  class: group
-  group: property
-  type: boolean
-  members:
-    - interface: xyz.openbmc_project.Inventory.Item
-      meta: PRESENT
-      property: Present
-
-- name: fan functional
-  description: >
-    'Monitor the functional state of each fan.'
-  class: group
-  group: property
-  type: boolean
-  members:
-    - interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-      meta: FUNCTIONAL
-      property: Functional
-
-- name: fan present and functional
-  description: >
-    'Monitor the present and functional state of each fan.'
-  class: group
-  group: property
-  type: boolean
-  members:
-    - interface: xyz.openbmc_project.Inventory.Item
-      meta: PRESENT
-      property: Present
-    - interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-      meta: FUNCTIONAL
-      property: Functional
-
-- name: chassis powered
-  description: >
-    'Monitor the chassis power state.'
-  class: group
-  group: property
-  type: string
-  members:
-    - interface: xyz.openbmc_project.State.Chassis
-      meta: CHASSIS_STATE
-      property: CurrentPowerState
-
-- name: chassis air cooled
-  description: >
-    'The chassis cooling type.'
-  class: group
-  group: property
-  type: boolean
-  members:
-    - interface: xyz.openbmc_project.Inventory.Decorator.CoolingType
-      meta: COOLING_TYPE
-      property: WaterCooled
-
-- name: watch chassis state
-  description: >
-    'Trigger logic on chassis power state changes.'
-  class: watch
-  watch: property
-  paths: chassis state
-  properties: chassis powered
-  callback: check power
-
-- name: watch fan0 presence
-  description: >
-    'Trigger logic on fan0 presence state changes.'
-  class: watch
-  watch: property
-  paths: fan0
-  properties: fan present
-  callback: check power fan0 presence
-
-- name: watch fan0 functional
-  description: >
-    'Trigger logic on fan0 functional state changes.'
-  class: watch
-  watch: property
-  paths: fan0
-  properties: fan functional
-  callback: check power fan0 functional
-
-- name: watch fan1 presence
-  description: >
-    'Trigger logic on fan1 presence state changes.'
-  class: watch
-  watch: property
-  paths: fan1
-  properties: fan present
-  callback: check power fan1 presence
-
-- name: watch fan1 functional
-  description: >
-    'Trigger logic on fan1 functional state changes.'
-  class: watch
-  watch: property
-  paths: fan1
-  properties: fan functional
-  callback: check power fan1 functional
-
-- name: watch fan2 presence
-  description: >
-    'Trigger logic on fan2 presence state changes.'
-  class: watch
-  watch: property
-  paths: fan2
-  properties: fan present
-  callback: check power fan2 presence
-
-- name: watch fan2 functional
-  description: >
-    'Trigger logic on fan2 functional state changes.'
-  class: watch
-  watch: property
-  paths: fan2
-  properties: fan functional
-  callback: check power fan2 functional
-
-- name: watch fan3 presence
-  description: >
-    'Trigger logic on fan3 presence state changes.'
-  class: watch
-  watch: property
-  paths: fan3
-  properties: fan present
-  callback: check power fan3 presence
-
-- name: watch fan3 functional
-  description: >
-    'Trigger logic on fan3 functional state changes.'
-  class: watch
-  watch: property
-  paths: fan3
-  properties: fan functional
-  callback: check power fan3 functional
-
-- name: watch fan0 present and functional for resolving error logs
-  description: >
-    'On fan present or functional state changes, check if errors need to be resolved.'
-  class: watch
-  watch: property
-  paths: fan0
-  properties: fan present and functional
-  callback: resolve fan0 errors if present and functional
-
-- name: watch fan1 present and functional for resolving error logs
-  description: >
-    'On fan present or functional state changes, check if errors need to be resolved.'
-  class: watch
-  watch: property
-  paths: fan1
-  properties: fan present and functional
-  callback: resolve fan1 errors if present and functional
-
-- name: watch fan2 present and functional for resolving error logs
-  description: >
-    'On fan present or functional state changes, check if errors need to be resolved.'
-  class: watch
-  watch: property
-  paths: fan2
-  properties: fan present and functional
-  callback: resolve fan2 errors if present and functional
-
-- name: watch fan3 present and functional for resolving error logs
-  description: >
-    'On fan present or functional state changes, check if errors need to be resolved.'
-  class: watch
-  watch: property
-  paths: fan3
-  properties: fan present and functional
-  callback: resolve fan3 errors if present and functional
-
-- name: check power
-  description: >
-    'If the chassis has power, check all fans.'
-  class: condition
-  condition: count
-  paths: chassis state
-  properties: chassis powered
-  callback: check fans
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: xyz.openbmc_project.State.Chassis.PowerState.On
-
-- name: check power fan0 presence
-  description: >
-    'If the chassis has power, check presence of fan0.'
-  class: condition
-  condition: count
-  paths: chassis state
-  properties: chassis powered
-  callback: check fan0 presence
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: xyz.openbmc_project.State.Chassis.PowerState.On
-
-- name: check power fan0 functional
-  description: >
-    'If the chassis has power, check functional of fan0.'
-  class: condition
-  condition: count
-  paths: chassis state
-  properties: chassis powered
-  callback: check fan0 functional
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: xyz.openbmc_project.State.Chassis.PowerState.On
-
-- name: check power fan1 presence
-  description: >
-    'If the chassis has power, check presence of fan1.'
-  class: condition
-  condition: count
-  paths: chassis state
-  properties: chassis powered
-  callback: check fan1 presence
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: xyz.openbmc_project.State.Chassis.PowerState.On
-
-- name: check power fan1 functional
-  description: >
-    'If the chassis has power, check functional of fan1.'
-  class: condition
-  condition: count
-  paths: chassis state
-  properties: chassis powered
-  callback: check fan1 functional
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: xyz.openbmc_project.State.Chassis.PowerState.On
-
-- name: check power fan2 presence
-  description: >
-    'If the chassis has power, check presence of fan2.'
-  class: condition
-  condition: count
-  paths: chassis state
-  properties: chassis powered
-  callback: check fan2 presence
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: xyz.openbmc_project.State.Chassis.PowerState.On
-
-- name: check power fan2 functional
-  description: >
-    'If the chassis has power, check functional of fan2.'
-  class: condition
-  condition: count
-  paths: chassis state
-  properties: chassis powered
-  callback: check fan2 functional
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: xyz.openbmc_project.State.Chassis.PowerState.On
-
-- name: check power fan3 presence
-  description: >
-    'If the chassis has power, check presence of fan3.'
-  class: condition
-  condition: count
-  paths: chassis state
-  properties: chassis powered
-  callback: check fan3 presence
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: xyz.openbmc_project.State.Chassis.PowerState.On
-
-- name: check power fan3 functional
-  description: >
-    'If the chassis has power, check functional of fan3.'
-  class: condition
-  condition: count
-  paths: chassis state
-  properties: chassis powered
-  callback: check fan3 functional
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: xyz.openbmc_project.State.Chassis.PowerState.On
-
-- name: check fans
-  description: >
-    'Verify each of the 3 fans are present.'
-  class: callback
-  callback: group
-  members:
-    - check fan0 presence
-    - check fan1 presence
-    - check fan2 presence
-    - check fan3 presence
-    - check fan0 functional
-    - check fan1 functional
-    - check fan2 functional
-    - check fan3 functional
-
-- name: check fan0 presence
-  description: >
-    'If this condition passes fan0 has been unplugged for more than 20 seconds.'
-  class: condition
-  condition: count
-  paths: fan0
-  properties: fan present
-  defer: 20000000us
-  callback: notpresent fan0 error
-  countop: '<'
-  countbound: 1
-  op: '=='
-  bound: true
-
-- name: check fan0 functional
-  description: >
-    'If this condition passes fan0 has been marked as nonfunctional.'
-  class: condition
-  condition: count
-  paths: fan0
-  properties: fan functional
-  callback: nonfunctional fan0 error
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: false
-
-- name: check fan1 presence
-  description: >
-    'If this condition passes fan1 has been unplugged for more than 20 seconds.
-     Fan 1 is not in a water cooled Witherspoon, so check for cooling type
-     before creating an error.'
-  class: condition
-  condition: count
-  paths: fan1
-  properties: fan present
-  defer: 20000000us
-  callback: check cooling type notpresent error
-  countop: '<'
-  countbound: 1
-  op: '=='
-  bound: true
-
-- name: check fan1 functional
-  description: >
-    'If this condition passes fan1 has been marked as nonfunctional.
-     Fan 1 is not in a water cooled Witherspoon, so check for cooling type
-     before creating an error.'
-  class: condition
-  condition: count
-  paths: fan1
-  properties: fan functional
-  callback: check cooling type nonfunctional error
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: false
-
-- name: check fan2 presence
-  description: >
-    'If this condition passes fan2 has been unplugged for more than 20 seconds.'
-  class: condition
-  condition: count
-  paths: fan2
-  properties: fan present
-  defer: 20000000us
-  callback: notpresent fan2 error
-  countop: '<'
-  countbound: 1
-  op: '=='
-  bound: true
-
-- name: check fan2 functional
-  description: >
-    'If this condition passes fan2 has been marked as nonfunctional.'
-  class: condition
-  condition: count
-  paths: fan2
-  properties: fan functional
-  callback: nonfunctional fan2 error
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: false
-
-- name: check fan3 presence
-  description: >
-    'If this condition passes fan3 has been unplugged for more than 20 seconds.'
-  class: condition
-  condition: count
-  paths: fan3
-  properties: fan present
-  defer: 20000000us
-  callback: notpresent fan3 error
-  countop: '<'
-  countbound: 1
-  op: '=='
-  bound: true
-
-- name: check fan3 functional
-  description: >
-    'If this condition passes fan3 has been marked as nonfunctional.'
-  class: condition
-  condition: count
-  paths: fan3
-  properties: fan functional
-  callback: nonfunctional fan3 error
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: false
-
-- name: check cooling type nonfunctional error
-  description: >
-    'If this condition passes the chassis is air cooled and will create a
-     nonfunctional error for fan 1.'
-  class: condition
-  condition: count
-  paths: chassis
-  properties: chassis air cooled
-  callback: nonfunctional fan1 error
-  countop: '=='
-  countbound: 0
-  op: '=='
-  bound: true
-
-- name: check cooling type notpresent error
-  description: >
-    'If this condition passes the chassis is air cooled and will create a
-     notpresent error for fan 1.'
-  class: condition
-  condition: count
-  paths: chassis
-  properties: chassis air cooled
-  callback: notpresent fan1 error
-  countop: '=='
-  countbound: 0
-  op: '=='
-  bound: true
-
-- name: notpresent fan0 error
-  class: callback
-  callback: elog
-  paths: fan0
-  properties: fan present
-  error: xyz::openbmc_project::Inventory::Error::NotPresent
-  metadata:
-    - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH
-      value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0
-      type: string
-
-- name: nonfunctional fan0 error
-  class: callback
-  callback: elog
-  paths: fan0
-  properties: fan functional
-  error: xyz::openbmc_project::Inventory::Error::Nonfunctional
-  metadata:
-    - name: xyz::openbmc_project::Inventory::Nonfunctional::CALLOUT_INVENTORY_PATH
-      value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0
-      type: string
-
-- name: notpresent fan1 error
-  class: callback
-  callback: elog
-  paths: fan1
-  properties: fan present
-  error: xyz::openbmc_project::Inventory::Error::NotPresent
-  metadata:
-    - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH
-      value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan1
-      type: string
-
-- name: nonfunctional fan1 error
-  class: callback
-  callback: elog
-  paths: fan1
-  properties: fan functional
-  error: xyz::openbmc_project::Inventory::Error::Nonfunctional
-  metadata:
-    - name: xyz::openbmc_project::Inventory::Nonfunctional::CALLOUT_INVENTORY_PATH
-      value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan1
-      type: string
-
-- name: notpresent fan2 error
-  class: callback
-  callback: elog
-  paths: fan2
-  properties: fan present
-  error: xyz::openbmc_project::Inventory::Error::NotPresent
-  metadata:
-    - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH
-      value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2
-      type: string
-
-- name: nonfunctional fan2 error
-  class: callback
-  callback: elog
-  paths: fan2
-  properties: fan functional
-  error: xyz::openbmc_project::Inventory::Error::Nonfunctional
-  metadata:
-    - name: xyz::openbmc_project::Inventory::Nonfunctional::CALLOUT_INVENTORY_PATH
-      value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2
-      type: string
-
-- name: notpresent fan3 error
-  class: callback
-  callback: elog
-  paths: fan3
-  properties: fan present
-  error: xyz::openbmc_project::Inventory::Error::NotPresent
-  metadata:
-    - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH
-      value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3
-      type: string
-
-- name: nonfunctional fan3 error
-  class: callback
-  callback: elog
-  paths: fan3
-  properties: fan functional
-  error: xyz::openbmc_project::Inventory::Error::Nonfunctional
-  metadata:
-    - name: xyz::openbmc_project::Inventory::Nonfunctional::CALLOUT_INVENTORY_PATH
-      value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3
-      type: string
-
-- name: resolve fan0 errors if present and functional
-  description: >
-    'If fan0 is present and functional, call the resolve fan0 errors callback.'
-  class: condition
-  condition: count
-  paths: fan0
-  properties: fan present and functional
-  callback: resolve fan0 errors
-  countop: '=='
-  countbound: 2
-  op: '=='
-  bound: true
-
-#Go ahead and do this on water cooled as well
-- name: resolve fan1 errors if present and functional
-  description: >
-    'If fan1 is present and functional, call the resolve fan1 errors callback.'
-  class: condition
-  condition: count
-  paths: fan1
-  properties: fan present and functional
-  callback: resolve fan1 errors
-  countop: '=='
-  countbound: 2
-  op: '=='
-  bound: true
-
-- name: resolve fan2 errors if present and functional
-  description: >
-    'If fan2 is present and functional, call the resolve fan2 errors callback.'
-  class: condition
-  condition: count
-  paths: fan2
-  properties: fan present and functional
-  callback: resolve fan2 errors
-  countop: '=='
-  countbound: 2
-  op: '=='
-  bound: true
-
-- name: resolve fan3 errors if present and functional
-  description: >
-    'If fan3 is present and functional, call the resolve fan3 errors callback.'
-  class: condition
-  condition: count
-  paths: fan3
-  properties: fan present and functional
-  callback: resolve fan3 errors
-  countop: '=='
-  countbound: 2
-  op: '=='
-  bound: true
-
-- name: resolve fan0 errors
-  class: callback
-  callback: resolve callout
-  paths: fan0
-  properties: fan present and functional
-  callout: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0
-
-- name: resolve fan1 errors
-  class: callback
-  callback: resolve callout
-  paths: fan1
-  properties: fan present and functional
-  callout: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan1
-
-- name: resolve fan2 errors
-  class: callback
-  callback: resolve callout
-  paths: fan2
-  properties: fan present and functional
-  callout: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2
-
-- name: resolve fan3 errors
-  class: callback
-  callback: resolve callout
-  paths: fan3
-  properties: fan present and functional
-  callout: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/water-cooled.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/water-cooled.yaml
deleted file mode 100644
index a279cfe..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/water-cooled.yaml
+++ /dev/null
@@ -1,322 +0,0 @@
-# Water cooled Witherspoon fan policy for PDM.
-#
-# A water cooled Witherspoon requires a minimum of two functional fan
-# enclosures or four functional fan rotors across all enclosures.
-# If the number of functional fan enclosures is below two, soft poweroff
-# the system, whereas if the number of fan rotors drop below four, an
-# immediate hard poweroff of the system occurs.
-
-- name: fan enclosures
-  description: >
-    'A water cooled Witherspoon has three fan enclosures to monitor.'
-  class: group
-  group: path
-  members:
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3
-
-- name: fan rotors
-  description: >
-    'A water cooled Witherspoon has six fan rotors to monitor.'
-  class: group
-  group: path
-  members:
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_0
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_1
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_0
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_1
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3/fan3_0
-    - meta: FAN
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3/fan3_1
-
-- name: chassis state
-  description: >
-    'Witherspoon has a single chassis to monitor.'
-  class: group
-  group: path
-  members:
-    - meta: CHASSISSTATE
-      path: /xyz/openbmc_project/state/chassis0
-
-- name: chassis
-  description: >
-    'Witherspoon has a single chassis to monitor.'
-  class: group
-  group: path
-  members:
-    - meta: CHASSIS
-      path: /xyz/openbmc_project/inventory/system/chassis
-
-- name: fan present
-  description: >
-    'Monitor the presence state of each fan.'
-  class: group
-  group: property
-  type: boolean
-  members:
-    - interface: xyz.openbmc_project.Inventory.Item
-      meta: PRESENT
-      property: Present
-
-- name: fan functional
-  description: >
-    'Monitor the functional state of each fan.'
-  class: group
-  group: property
-  type: boolean
-  members:
-    - interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-      meta: FUNCTIONAL
-      property: Functional
-
-- name: chassis powered
-  description: >
-    'Monitor the chassis power state.'
-  class: group
-  group: property
-  type: string
-  members:
-    - interface: xyz.openbmc_project.State.Chassis
-      meta: CHASSIS_STATE
-      property: CurrentPowerState
-
-- name: chassis water cooled
-  description: >
-    'Monitor the chassis cooling type.'
-  class: group
-  group: property
-  type: boolean
-  members:
-    - interface: xyz.openbmc_project.Inventory.Decorator.CoolingType
-      meta: COOLING_TYPE
-      property: WaterCooled
-
-- name: watch fan present
-  description: >
-    'Trigger logic on fan enclosure presence state changes.'
-  class: watch
-  watch: property
-  paths: fan enclosures
-  properties: fan present
-  callback: check cooling type
-
-- name: watch fan functional
-  description: >
-    'Trigger logic on fan enclosure functional state changes.'
-  class: watch
-  watch: property
-  paths: fan enclosures
-  properties: fan functional
-  callback: check cooling type
-
-- name: watch fan rotor functional
-  description: >
-    'Trigger logic on fan rotor functional state changes.'
-  class: watch
-  watch: property
-  paths: fan rotors
-  properties: fan functional
-  callback: check cooling type
-
-- name: watch chassis state
-  description: >
-    'Trigger logic on chassis power state changes.'
-  class: watch
-  watch: property
-  paths: chassis state
-  properties: chassis powered
-  callback: check cooling type
-
-- name: watch cooling type
-  description: >
-    'Maintain a cache of the chassis cooling type.'
-  class: watch
-  watch: property
-  paths: chassis
-  properties: chassis water cooled
-
-- name: check cooling type
-  description: >
-    'If this condition passes the chassis is water cooled.'
-  class: condition
-  condition: count
-  paths: chassis
-  properties: chassis water cooled
-  callback: check power
-  countop: '=='
-  countbound: 1
-  op: '=='
-  bound: true
-
-- name: check power
-  description: >
-    'If the chassis has power, check fans.'
-  class: condition
-  condition: count
-  paths: chassis state
-  properties: chassis powered
-  callback: check fans
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: xyz.openbmc_project.State.Chassis.PowerState.On
-
-- name: check fans
-  description: >
-    'Verify there are at least two functional fan enclosures and at least
-    four functional fan rotors, power off if not.'
-  class: callback
-  callback: group
-  members:
-    - check group presence
-    - check group functional enclosures
-    - check group functional rotors
-
-- name: check group presence
-  description: >
-    'If this condition passes more than one fan has been unplugged
-    for more than 25 seconds.  Shut the system down.  Count present
-    fans rather than non-present fans since the latter would pass
-    if the fan has not been created for some reason.
-
-    For a more detailed definition of unplugged, consult the documentation
-    of xyz.openbmc_project.Inventory.Item and/or the documentation
-    of the fan inventory object implementation.'
-  class: condition
-  condition: count
-  paths: fan enclosures
-  properties: fan present
-  defer: 25000000us
-  callback: log and shutdown
-  countop: '<'
-  countbound: 2
-  op: '=='
-  bound: true
-
-- name: check group functional enclosures
-  description: >
-    'If this condition passes more than one fan enclosure in the group has been
-    marked as nonfunctional for five seconds. Shut the system down.
-
-    For a more detailed definition of nonfunctional, consult the documentation
-    of xyz.openbmc_project.State.Decorator.OperationalStatus and/or the
-    documentation of the fan inventory object implementation.'
-  class: condition
-  condition: count
-  paths: fan enclosures
-  properties: fan functional
-  defer: 5000000us
-  callback: log and shutdown
-  countop: '>'
-  countbound: 1
-  op: '=='
-  bound: false
-
-- name: check group functional rotors
-  description: >
-    'If this condition passes more than two fan rotors in the group have been
-    marked as nonfunctional for five seconds. Immediately power off.
-
-    For a more detailed definition of nonfunctional, consult the documentation
-    of xyz.openbmc_project.State.Decorator.OperationalStatus and/or the
-    documentation of the fan inventory object implementation.'
-  class: condition
-  condition: count
-  paths: fan rotors
-  properties: fan functional
-  defer: 5000000us
-  callback: log and poweroff
-  countop: '>'
-  countbound: 2
-  op: '=='
-  bound: false
-
-- name: log and poweroff
-  description: >
-    'Immediately poweroff, log an event in the journal, and create an
-     error log.'
-  class: callback
-  callback: group
-  members:
-    - hard poweroff
-    - log hard poweroff
-    - create shutdown error
-
-- name: log and shutdown
-  description: >
-    'Shut the system down, log an event in the journal, and create an
-     error log.'
-  class: callback
-  callback: group
-  members:
-    - shutdown
-    - log shutdown
-    - create shutdown error
-
-- name: hard poweroff
-  description: >
-    'Immediately power off the system.'
-  class: callback
-  callback: method
-  service: org.freedesktop.systemd1
-  path: /org/freedesktop/systemd1
-  interface: org.freedesktop.systemd1.Manager
-  method: StartUnit
-  args:
-    - value: obmc-chassis-hard-poweroff@0.target
-      type: string
-    - value: replace
-      type: string
-
-- name: shutdown
-  description: >
-    'Shut down the system.'
-  class: callback
-  callback: method
-  service: org.freedesktop.systemd1
-  path: /org/freedesktop/systemd1
-  interface: org.freedesktop.systemd1.Manager
-  method: StartUnit
-  args:
-    - value: obmc-host-shutdown@0.target
-      type: string
-    - value: replace
-      type: string
-
-- name: log hard poweroff
-  description: >
-    'Log a hard poweroff event to the systemd journal.'
-  class: callback
-  callback: journal
-  paths: chassis state
-  properties: chassis powered
-  severity: ERR
-  message: Immediate poweroff of system. There are not enough functional fans.
-
-- name: log shutdown
-  description: >
-    'Log a shutdown event to the systemd journal.'
-  class: callback
-  callback: journal
-  paths: chassis state
-  properties: chassis powered
-  severity: ERR
-  message: Request shutdown of system. There are not enough functional fans.
-
-- name: create shutdown error
-  description: >
-    'Create a Fan Shutdown Error log.'
-  class: callback
-  callback: elog
-  paths: chassis state
-  properties: chassis powered
-  error: xyz::openbmc_project::State::Shutdown::Inventory::Error::Fan
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog.bb
deleted file mode 100644
index c09b9df..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Witherspoon fan watchdog services"
-PR = "r1"
-
-inherit obmc-phosphor-license
-inherit obmc-phosphor-systemd
-
-RDEPENDS_${PN} += "virtual/obmc-gpio-monitor"
-RDEPENDS_${PN} += "busybox"
-
-RESET_SERVICE = "witherspoon-reset-fan-watchdog.service"
-TGTFMT = "obmc-chassis-poweron@0.target"
-RESET_FMT = "../${RESET_SERVICE}:${TGTFMT}.requires/${RESET_SERVICE}"
-
-MONITOR_SERVICE = "witherspoon-fan-watchdog-monitor@.service"
-
-WATCHDOG_SERVICE = "witherspoon-fan-watchdog.service"
-WATCHDOG_FMT = "../${WATCHDOG_SERVICE}:${TGTFMT}.requires/${WATCHDOG_SERVICE}"
-
-SYSTEMD_SERVICE_${PN} += "${RESET_SERVICE} ${MONITOR_SERVICE} ${WATCHDOG_SERVICE}"
-SYSTEMD_LINK_${PN} += "${RESET_FMT} ${WATCHDOG_FMT}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/witherspoon-fan-watchdog/fan-watchdog.conf"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/fan-watchdog.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/fan-watchdog.conf
deleted file mode 100644
index ce7824c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/fan-watchdog.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMEOUT=5
-INTERVAL=1
-DEVICE=/dev/watchdog0
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf
deleted file mode 100644
index b4e5ce7..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-GPIO_PATH=/dev/gpiochip0
-GPIO=109
-DELAY=1
-ACTION=low_high
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service
deleted file mode 100644
index 945561b..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Fan Watchdog Failure Monitor
-
-#This can get called every time a process dies, so ensure it's never limited
-StartLimitIntervalSec=0
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/env phosphor-unit-failure-monitor --source %i --target obmc-fan-watchdog-takeover.target --action start
-SyslogIdentifier=phosphor-unit-failure-monitor
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog.service b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog.service
deleted file mode 100644
index 5b59546..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Witherspoon Fan Watchdog Daemon
-Wants=phosphor-fan-control-init@0.service
-Before=phosphor-fan-control-init@0.service
-Conflicts=obmc-fan-watchdog-takeover.target
-
-[Service]
-EnvironmentFile={envfiledir}/obmc/witherspoon-fan-watchdog/fan-watchdog.conf
-ExecStart=/sbin/watchdog -T ${{TIMEOUT}} -t ${{INTERVAL}} -F ${{DEVICE}}
-KillSignal=SIGKILL
-
-[Install]
-RequiredBy=obmc-chassis-poweron@0.target
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service
deleted file mode 100644
index e0ef0ae..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Witherspoon Fan Watchdog Reset
-Wants=phosphor-fan-control-init@0.service
-Before=phosphor-fan-control-init@0.service
-Conflicts=obmc-chassis-poweroff@0.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile={envfiledir}/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf
-ExecStart=/usr/bin/env phosphor-gpio-util -p ${{GPIO_PATH}} -g ${{GPIO}} -a ${{ACTION}} -d ${{DELAY}}
-SyslogIdentifier=phosphor-gpio-util
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy-native.bb
deleted file mode 100644
index 39831cf..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy-native.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SUMMARY = "Thermal policy for Witherspoon"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-inherit phosphor-dbus-monitor
-
-SRC_URI += "file://thermal-policy.yaml"
-
-do_install() {
-        install -D ${WORKDIR}/thermal-policy.yaml ${D}${config_dir}/thermal-policy.yaml
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy/thermal-policy.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy/thermal-policy.yaml
deleted file mode 100644
index 1dd2306..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy/thermal-policy.yaml
+++ /dev/null
@@ -1,187 +0,0 @@
-# Witherspoon thermal policy for PDM.
-#
-# Shut down a Witherspoon system if more than three POWER9 cores
-# have a temperature greater than 115 degrees Celcius.
-
-
-- name: core sensors
-  description: >
-    'Witherspoon has two POWER9 chips with 24 cores each.'
-  class: group
-  group: path
-  members:
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core0_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core1_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core2_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core3_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core4_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core5_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core6_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core7_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core8_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core9_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core10_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core11_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core12_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core13_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core14_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core15_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core16_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core17_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core18_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core19_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core20_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core21_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core22_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p0_core23_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core0_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core1_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core2_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core3_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core4_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core5_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core6_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core7_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core8_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core9_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core10_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core11_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core12_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core13_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core14_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core15_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core16_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core17_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core18_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core19_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core20_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core21_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core22_temp
-    - meta: SENSOR
-      path: /xyz/openbmc_project/sensors/temperature/p1_core23_temp
-
-- name: core temp
-  description: >
-    'Monitor the temperature of each core.'
-  class: group
-  group: property
-  type: int64
-  members:
-    - interface: xyz.openbmc_project.Sensor.Value
-      meta: TEMP
-      property: Value
-
-- name: watch core temps
-  description: >
-    'Trigger logic on core temp changes.'
-  class: watch
-  watch: property
-  paths: core sensors
-  properties: core temp
-  callback: check temps
-
-- name: check temps
-  description: >
-    'If this condition passes at least three cores are running
-    too hot.  Shut the system down.'
-  class: condition
-  condition: count
-  paths: core sensors
-  properties: core temp
-  callback: log and shutdown
-  countop: '>='
-  countbound: 3
-  op: '>='
-  bound: 115000
-  oneshot: true
-
-- name: log and shutdown
-  description: >
-    'Shut the system down and log an event.'
-  class: callback
-  callback: group
-  members:
-    - shutdown
-    - create criticalhigh error
-    - create shutdown error
-
-- name: shutdown
-  description: >
-    'Shut down the system.'
-  class: callback
-  callback: method
-  service: org.freedesktop.systemd1
-  path: /org/freedesktop/systemd1
-  interface: org.freedesktop.systemd1.Manager
-  method: StartUnit
-  args:
-    - value: obmc-chassis-hard-poweroff@0.target
-      type: string
-    - value: replace
-      type: string
-
-- name: create criticalhigh error
-  description: >
-    'Create a CriticalHigh Error log.'
-  class: callback
-  callback: elog_with_metadata
-  paths: core sensors
-  properties: core temp
-  error: xyz::openbmc_project::Sensor::Threshold::Error::CriticalHigh
-  metadata: xyz::openbmc_project::Sensor::Threshold::CriticalHigh::SENSOR_DATA
-
-- name: create shutdown error
-  description: >
-    'Create a SystemShutdown Error log.'
-  class: callback
-  callback: elog
-  paths: core sensors
-  properties: core temp
-  error: xyz::openbmc_project::State::Shutdown::ThermalEvent::Error::Processor
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/openpower-software-manager.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/flash/openpower-software-manager.bbappend
deleted file mode 100644
index 3dcc25d..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/openpower-software-manager.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG_append_df-openpower-ubi-fs = " verify_pnor_signature"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend
deleted file mode 100644
index eafd11f..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-BMC_RW_MTD = "bmc"
-BMC_RO_MTD = "alt-bmc+bmc"
-BMC_KERNEL_MTD = "bmc"
-BMC_RW_SIZE = "0x600000"
-
-# Enable signature verification by DISTRO_FEATURE obmc-ubi-fs
-PACKAGECONFIG_append_df-obmc-ubi-fs = " verify_signature"
-
-# Enable sync of persistent files to the alternate BMC chip
-PACKAGECONFIG_append_df-obmc-ubi-fs = " sync_bmc_files"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor.bbappend
deleted file mode 100644
index b60a64b..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-
-TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service"
-INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service"
-POWERSUPPLY_TGT = "${SYSTEMD_DEFAULT_TARGET}"
-FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}"
-
-SYSTEMD_LINK_${PN}-presence += "${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
-
-POWERSUPPLY_ENV_FMT  = "obmc/gpio/phosphor-power-supply-{0}.conf"
-
-SYSTEMD_ENVIRONMENT_FILE_${PN}-presence += "${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf
deleted file mode 100644
index 285a8f7..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-INVENTORY=/system/chassis/motherboard/powersupply0
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=104
-NAME=powersupply0
-DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
deleted file mode 100644
index 56e16c5..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-INVENTORY=/system/chassis/motherboard/powersupply1
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=127
-NAME=powersupply1
-DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend
deleted file mode 100644
index 4cac490..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-RDEPENDS_${PN} += 'avsbus-control'
-RDEPENDS_${PN} += 'vrm-control'
-RDEPENDS_${PN}_remove += "p9-vcs-workaround"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
deleted file mode 100644
index bea352f..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/interfaces/phosphor-rest.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/interfaces/phosphor-rest.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/interfaces/phosphor-rest.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/interfaces/phosphor-rest/url_config.json b/meta-ibm/meta-witherspoon/recipes-phosphor/interfaces/phosphor-rest/url_config.json
deleted file mode 100644
index 46a4d02..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/interfaces/phosphor-rest/url_config.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "urls": [
- "/org/open_power/*",
- "/com/ibm/*",
- "/xyz/openbmc_project/*",
- "/enumerate",
- "/list",
- "/login",
- "/logout",
- "/subscribe",
- "/upload/image",
- "/download/dump/*"
- ]
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup-native.bb
deleted file mode 100644
index 6efde48..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup-native.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "Copy Witherspoon inventory cleanup yaml for inventory manager"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-inherit phosphor-inventory-manager
-
-SRC_URI += "file://inventory-cleanup.yaml"
-
-S = "${WORKDIR}"
-
-do_install() {
-        install -d ${D}${base_datadir}/events.d/
-        install ${S}/inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
deleted file mode 100644
index 01632e6..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-description: >
-    Witherspoon inventory fixups
-
-events:
-    - name: Remove power_supplies
-      description: >
-          Remove the deprecated 'power_supply' objects
-      type: startup
-      actions:
-          - name: destroyObjects
-            paths:
-                - /system/chassis/power_supply0
-                - /system/chassis/power_supply1
-                - /system/chassis/powersupply0
-                - /system/chassis/powersupply1
-
-    - name: Remove fan1
-      description: >
-          Remove all fan1 associated objects and have fan presence and
-          fan monitor create it based on cooling type.
-      type: startup
-      actions:
-          - name: destroyObjects
-            paths:
-                - /system/chassis/motherboard/fan1/fan1_0
-                - /system/chassis/motherboard/fan1/fan1_1
-                - /system/chassis/motherboard/fan1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bbappend
deleted file mode 100644
index d9304c0..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PHOSPHOR_INVENTORY_MANAGER_CONFIGS += "inventory-cleanup-native"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml
deleted file mode 100644
index 072cc5c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
-50:
-  /system/chassis/motherboard/fan0:
-    entityID: 29
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Product Name
-          IPMIFruSection: Product
-51:
-  /system/chassis/motherboard/fan1:
-    entityID: 29
-    entityInstance: 2
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Product Name
-          IPMIFruSection: Product
-52:
-  /system/chassis/motherboard/fan2:
-    entityID: 29
-    entityInstance: 3
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Product Name
-          IPMIFruSection: Product
-53:
-  /system/chassis/motherboard/fan3:
-    entityID: 29
-    entityInstance: 4
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Product Name
-          IPMIFruSection: Product
-60:
-  /system/chassis/motherboard/boxelder/bmc:
-    entityID: 6
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Board Name
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-70:
-  /system/chassis/motherboard/boxelder/bmc/ethernet:
-    entityID: 1
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Product Name
-          IPMIFruSection: Product
-75:
-  /system/chassis/motherboard/powersupply0:
-    entityID: 10
-    entityInstance: 1
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Board Name
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
-76:
-  /system/chassis/motherboard/powersupply1:
-    entityID: 10
-    entityInstance: 2
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Board Name
-          IPMIFruSection: Board
-      xyz.openbmc_project.Inventory.Decorator.Asset:
-        PartNumber:
-          IPMIFruProperty: Part Number
-          IPMIFruSection: Board
-        SerialNumber:
-          IPMIFruProperty: Serial Number
-          IPMIFruSection: Board
-        Model:
-          IPMIFruProperty: Model Number
-          IPMIFruSection: Board
-        Manufacturer:
-          IPMIFruProperty: Manufacturer
-          IPMIFruSection: Board
-        BuildDate:
-          IPMIFruProperty: Mfg Date
-          IPMIFruSection: Board
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%/fru-config-not-sent-by-host.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%/fru-config-not-sent-by-host.yaml
deleted file mode 100644
index 65c02b6..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%/fru-config-not-sent-by-host.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-20:
-  /system/chassis/motherboard/gv100card0: &DEFAULTS
-    entityInstance: 1
-    entityID: 3
-    interfaces:
-      xyz.openbmc_project.Inventory.Item:
-        PrettyName:
-          IPMIFruProperty: Board Name
-          IPMIFruSection: Board
-21:
-  /system/chassis/motherboard/gv100card1:
-    <<: *DEFAULTS
-    entityInstance: 2
-22:
-  /system/chassis/motherboard/gv100card2:
-    <<: *DEFAULTS
-    entityInstance: 3
-23:
-  /system/chassis/motherboard/gv100card3:
-    <<: *DEFAULTS
-    entityInstance: 4
-24:
-  /system/chassis/motherboard/gv100card4:
-    <<: *DEFAULTS
-    entityInstance: 5
-25:
-  /system/chassis/motherboard/gv100card5:
-    <<: *DEFAULTS
-    entityInstance: 6
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend
deleted file mode 100644
index a314d16..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_append_witherspoon := ":${THISDIR}/${PN}"
-SRC_URI_append_witherspoon = " \
-	file://occ_sensors.hardcoded.yaml \
-	file://hwmon_sensors.hardcoded.yaml \
-	file://channel.yaml \
-	"
-
-EXTRA_OECONF_append_witherspoon = " \
-        CHANNEL_YAML_GEN=${WORKDIR}/channel.yaml \
-        "
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml
deleted file mode 100644
index 627f496..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Channel Number (must be unique) is the key
-1:
-  # ifName the ethernet device name (used in the dbus path)
-  ifName: eth0
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml
deleted file mode 100644
index f81159c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml
+++ /dev/null
@@ -1,573 +0,0 @@
-0xdd:
-  entityID: 0x1D
-  entityInstance: 1
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan0_0
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xde:
-  entityID: 0x1D
-  entityInstance: 2
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan0_1
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xdf:
-  entityID: 0x1D
-  entityInstance: 3
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan1_0
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xe2:
-  entityID: 0x1D
-  entityInstance: 4
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan1_1
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xe3:
-  entityID: 0x1D
-  entityInstance: 5
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan2_0
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xe4:
-  entityID: 0x1D
-  entityInstance: 6
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan2_1
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xe5:
-  entityID: 0x1D
-  entityInstance: 7
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan3_0
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xe6:
-  entityID: 0x1D
-  entityInstance: 8
-  sensorType: 0x04
-  path: /xyz/openbmc_project/sensors/fan_tach/fan3_1
-  sensorReadingType: 0x01
-  multiplierM: 100
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-  scale: 0
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xe7:
-  entityID: 0x0A
-  entityInstance: 1
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/fan_disk_power
-  sensorReadingType: 0x01
-  multiplierM: 2
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xee:
-  entityID: 0x0A
-  entityInstance: 9
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/p0_io_power
-  sensorReadingType: 0x01
-  multiplierM: 1
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xef:
-  entityID: 0x0A
-  entityInstance: 10
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/p1_io_power
-  sensorReadingType: 0x01
-  multiplierM: 1
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xf0:
-  entityID: 0x0A
-  entityInstance: 11
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/p0_mem_power
-  sensorReadingType: 0x01
-  multiplierM: 2
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xf1:
-  entityID: 0x0A
-  entityInstance: 12
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/p1_mem_power
-  sensorReadingType: 0x01
-  multiplierM: 2
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xf2:
-  entityID: 0x0A
-  entityInstance: 13
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/p0_power
-  sensorReadingType: 0x01
-  multiplierM: 2
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xf3:
-  entityID: 0x0A
-  entityInstance: 14
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/p1_power
-  sensorReadingType: 0x01
-  multiplierM: 2
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-
-0xf4:
-  entityID: 0x0A
-  entityInstance: 15
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/ps0_input_power
-  sensorReadingType: 0x01
-  multiplierM: 10
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xf5:
-  entityID: 0x0A
-  entityInstance: 16
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/ps1_input_power
-  sensorReadingType: 0x01
-  multiplierM: 10
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xf6:
-  entityID: 0x0A
-  entityInstance: 17
-  sensorType: 0x08
-  path: /xyz/openbmc_project/sensors/power/total_power
-  sensorReadingType: 0x01
-  multiplierM: 20
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-  scale: -6
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xf7:
-  entityID: 0x0A
-  entityInstance: 19
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/ps0_input_voltage
-  sensorReadingType: 0x01
-  multiplierM: 2
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xf8:
-  entityID: 0x0A
-  entityInstance: 20
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/ps1_input_voltage
-  sensorReadingType: 0x01
-  multiplierM: 2
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xf9:
-  entityID: 0x0A
-  entityInstance: 21
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/ps0_output_voltage
-  sensorReadingType: 0x01
-  multiplierM: 10
-  offsetB: 0
-  bExp: 0
-  rExp: -2
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xfa:
-  entityID: 0x0A
-  entityInstance: 22
-  sensorType: 0x02
-  path: /xyz/openbmc_project/sensors/voltage/ps1_output_voltage
-  sensorReadingType: 0x01
-  multiplierM: 10
-  offsetB: 0
-  bExp: 0
-  rExp: -2
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-  scale: -3
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xfb:
-  entityID: 0x0A
-  entityInstance: 23
-  sensorType: 0x03
-  path: /xyz/openbmc_project/sensors/current/ps0_output_current
-  sensorReadingType: 0x01
-  multiplierM: 1
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes
-  scale: -3
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xfc:
-  entityID: 0x0A
-  entityInstance: 24
-  sensorType: 0x03
-  path: /xyz/openbmc_project/sensors/current/ps1_output_current
-  sensorReadingType: 0x01
-  multiplierM: 1
-  offsetB: 0
-  bExp: 0
-  rExp: 0
-  unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes
-  scale: -3
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xfd:
-  entityID: 0x23
-  entityInstance: 1
-  sensorType: 0x01
-  path: /xyz/openbmc_project/sensors/temperature/pcie
-  sensorReadingType: 0x01
-  multiplierM: 30
-  offsetB: 0
-  bExp: 0
-  rExp: -2
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-  scale: -3
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
-0xfe:
-  entityID: 0x40
-  entityInstance: 1
-  sensorType: 0x01
-  path: /xyz/openbmc_project/sensors/temperature/ambient
-  sensorReadingType: 0x01
-  multiplierM: 20
-  offsetB: 0
-  bExp: 0
-  rExp: -2
-  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-  scale: -3
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingData
-  sensorNamePattern: nameLeaf
-  interfaces:
-    xyz.openbmc_project.Sensor.Value:
-      Value:
-        Offsets:
-          0xFF:
-            type: int64_t
-
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/occ_sensors.hardcoded.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/occ_sensors.hardcoded.yaml
deleted file mode 100644
index a52a8f0..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/occ_sensors.hardcoded.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-0x08:
-  entityID: 0xD2
-  entityInstance: 1
-  sensorType: 0x09
-  path: /org/open_power/control/occ0
-  sensorReadingType: 0x09
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  sensorNamePattern: nameLeaf
-  interfaces:
-    org.open_power.OCC.Status:
-      OccActive:
-        Offsets:
-          0x00:
-            assert: false
-            deassert: true
-            type: bool
-          0x01:
-            assert: true
-            deassert: false
-            type: bool
-0x09:
-  entityID: 0xD2
-  entityInstance: 2
-  sensorType: 0x09
-  path: /org/open_power/control/occ1
-  sensorReadingType: 0x09
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  sensorNamePattern: nameLeaf
-  interfaces:
-    org.open_power.OCC.Status:
-      OccActive:
-        Offsets:
-          0x00:
-            assert: false
-            deassert: true
-            type: bool
-          0x01:
-            assert: true
-            deassert: false
-            type: bool
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config.bb
deleted file mode 100644
index 8ab47c6..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config.bb
+++ /dev/null
@@ -1,82 +0,0 @@
-SUMMARY = "Witherspoon IPMI daemon configuration"
-PR = "r1"
-
-inherit obmc-phosphor-license
-inherit allarch
-
-SRC_URI = " \
-    file://cipher_list.json \
-    file://dcmi_cap.json \
-    file://dcmi_sensors.json \
-    file://dev_id.json \
-    file://power_reading.json \
-    "
-
-FILES_${PN} = " \
-    ${datadir}/ipmi-providers/cipher_list.json \
-    ${datadir}/ipmi-providers/dcmi_cap.json \
-    ${datadir}/ipmi-providers/dcmi_sensors.json \
-    ${datadir}/ipmi-providers/dev_id.json \
-    ${datadir}/ipmi-providers/power_reading.json \
-    "
-
-do_fetch[noexec] = "1"
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-# Calculate the auxiliary firmware revision to be updated in the dev_id.json
-# file. It is calculated from the VERSION_ID field which currently has two
-# formats. The revision field is 4 bytes, the first two bytes represent the
-# count of commits from the tagging and next two bytes represent the version.
-# Both fields are represented in BCD encoded format, so 9999 is the maximum
-# value both fields can take. With the format "v2.1-216-ga78ace8", Petitboot
-# would display the firmware revision as "Firmware version: 2.01.02160000",
-# "0216" is count and the revision is "0000". With the format
-# "ibm-v2.0-10-r41-0-gd0c319e" Petitboot would display the firmware revision
-# as "Firmware version: 2.00.00100041", "0010" is count and the revision
-# is "0041".
-
-inherit image_version
-
-do_patch[depends] = "os-release:do_populate_sysroot"
-
-python do_patch() {
-    import json
-    import re
-    from shutil import copyfile
-    version_id = do_get_version(d)
-
-    # count from the commit version
-    count = re.findall("-(\d{1,4})-", version_id)
-
-    release = re.findall("-r(\d{1,4})", version_id)
-    if release:
-        auxVer = count[0] + "{0:0>4}".format(release[0])
-    else:
-        auxVer = count[0] + "0000"
-
-    workdir = d.getVar('WORKDIR', True)
-    file = os.path.join(workdir, 'dev_id.json')
-
-    # Update dev_id.json with the auxiliary firmware revision
-    with open(file, "r+") as jsonFile:
-        data = json.load(jsonFile)
-        jsonFile.seek(0)
-        jsonFile.truncate()
-        data["aux"] = int(auxVer, 16)
-        json.dump(data, jsonFile)
-}
-
-do_install() {
-    install -d ${D}${datadir}/ipmi-providers
-    install -m 0644 -D ${WORKDIR}/cipher_list.json \
-        ${D}${datadir}/ipmi-providers/cipher_list.json
-    install -m 0644 -D ${WORKDIR}/dcmi_cap.json \
-        ${D}${datadir}/ipmi-providers/dcmi_cap.json
-    install -m 0644 -D ${WORKDIR}/dcmi_sensors.json \
-        ${D}${datadir}/ipmi-providers/dcmi_sensors.json
-    install -m 0644 -D ${WORKDIR}/dev_id.json \
-        ${D}${datadir}/ipmi-providers/dev_id.json
-    install -m 0644 -D ${WORKDIR}/power_reading.json \
-        ${D}${datadir}/ipmi-providers/power_reading.json
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/cipher_list.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/cipher_list.json
deleted file mode 100644
index 0f13b1e..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/cipher_list.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "a":{
-        "cipher":1,
-        "authentication":1,
-        "integrity":0,
-        "confidentiality":0
-    },
-    "b":{
-        "cipher":2,
-        "authentication":1,
-        "integrity":1,
-        "confidentiality":0
-    },
-    "c":{
-        "cipher":3,
-        "authentication":1,
-        "integrity":1,
-        "confidentiality":1
-    },
-    "d":{
-        "cipher":15,
-        "authentication":3,
-        "integrity":0,
-        "confidentiality":0
-    },
-    "e":{
-        "cipher":16,
-        "authentication":3,
-        "integrity":4,
-        "confidentiality":0
-    },
-    "f":{
-        "cipher":17,
-        "authentication":3,
-        "integrity":4,
-        "confidentiality":1
-    }
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dcmi_cap.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dcmi_cap.json
deleted file mode 100644
index 2d88320..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dcmi_cap.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "PowerManagement": 1,
-    "OOBSecondaryLan": 0,
-    "SerialTMODE": 0,
-    "InBandSystemInterfaceChannel": 1,
-    "SELAutoRollOver": 1,
-    "FlushEntireSELUponRollOver": 0,
-    "RecordLevelSELFlushUponRollOver": 0,
-    "NumberOfSELEntries": 200,
-    "TempMonitoringSamplingFreq":0,
-    "PowerMgmtDeviceSlaveAddress": 0,
-    "BMCChannelNumber": 0,
-    "DeviceRivision": 0,
-    "MandatoryPrimaryLanOOBSupport": 1,
-    "OptionalSecondaryLanOOBSupport": 255,
-    "OptionalSerialOOBMTMODECapability": 255
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dcmi_sensors.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dcmi_sensors.json
deleted file mode 100644
index 8370713..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dcmi_sensors.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-    "inlet": [
-        {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/ambient", "record_id": 254}
-    ],
-    "baseboard": [
-        {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/pcie", "record_id": 253}
-    ],
-    "cpu": [
-        {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core0_temp", "record_id": 17},
-        {"instance": 2, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core1_temp", "record_id": 20},
-        {"instance": 3, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core2_temp", "record_id": 23},
-        {"instance": 4, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core3_temp", "record_id": 26},
-        {"instance": 5, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core4_temp", "record_id": 29},
-        {"instance": 6, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core5_temp", "record_id": 32},
-        {"instance": 7, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core6_temp", "record_id": 35},
-        {"instance": 8, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core7_temp", "record_id": 38},
-        {"instance": 9, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core8_temp", "record_id": 41},
-        {"instance": 10, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core9_temp", "record_id": 44},
-        {"instance": 11, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core10_temp", "record_id": 47},
-        {"instance": 12, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core11_temp", "record_id": 50},
-        {"instance": 13, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core12_temp", "record_id": 53},
-        {"instance": 14, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core13_temp", "record_id": 56},
-        {"instance": 15, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core14_temp", "record_id": 59},
-        {"instance": 16, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core15_temp", "record_id": 62},
-        {"instance": 17, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core16_temp", "record_id": 65},
-        {"instance": 18, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core17_temp", "record_id": 68},
-        {"instance": 19, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core18_temp", "record_id": 71},
-        {"instance": 20, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core19_temp", "record_id": 74},
-        {"instance": 21, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core20_temp", "record_id": 77},
-        {"instance": 22, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core21_temp", "record_id": 80},
-        {"instance": 23, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core22_temp", "record_id": 83},
-        {"instance": 24, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core23_temp", "record_id": 86},
-        {"instance": 25, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core0_temp", "record_id": 91},
-        {"instance": 26, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core1_temp", "record_id": 94},
-        {"instance": 27, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core2_temp", "record_id": 97},
-        {"instance": 28, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core3_temp", "record_id": 100},
-        {"instance": 29, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core4_temp", "record_id": 103},
-        {"instance": 30, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core5_temp", "record_id": 106},
-        {"instance": 31, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core6_temp", "record_id": 109},
-        {"instance": 32, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core7_temp", "record_id": 112},
-        {"instance": 33, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core8_temp", "record_id": 115},
-        {"instance": 34, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core9_temp", "record_id": 118},
-        {"instance": 35, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core10_temp", "record_id": 121},
-        {"instance": 36, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core11_temp", "record_id": 124},
-        {"instance": 37, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core12_temp", "record_id": 127},
-        {"instance": 38, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core13_temp", "record_id": 130},
-        {"instance": 39, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core14_temp", "record_id": 133},
-        {"instance": 40, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core15_temp", "record_id": 136},
-        {"instance": 41, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core16_temp", "record_id": 139},
-        {"instance": 42, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core17_temp", "record_id": 142},
-        {"instance": 43, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core18_temp", "record_id": 145},
-        {"instance": 44, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core19_temp", "record_id": 148},
-        {"instance": 45, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core20_temp", "record_id": 151},
-        {"instance": 46, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core21_temp", "record_id": 154},
-        {"instance": 47, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core22_temp", "record_id": 157},
-        {"instance": 48, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core23_temp", "record_id": 160}
-    ]
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dev_id.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dev_id.json
deleted file mode 100644
index 6cd9a94..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/dev_id.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{"id": 0, "revision": 128, "addn_dev_support": 141,
-    "manuf_id": 42817, "prod_id": 16975, "aux": 0}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/power_reading.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/power_reading.json
deleted file mode 100644
index 97e8f32..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/witherspoon-ipmi-config/power_reading.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "path": "/xyz/openbmc_project/sensors/power/total_power"
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging.bbappend
deleted file mode 100644
index 913a0e8..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PACKAGECONFIG += "policy-interface"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json
deleted file mode 100644
index 3b66195..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json
+++ /dev/null
@@ -1,17145 +0,0 @@
-{
-    "events": {
-        "External Software CSM||Event Type Lookup Failure": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Events / Monitoring",
-            "BMCMessageID": "External Software CSM",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPEM0003G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "CSM",
-            "Message": "Failed to find an alert in the CSM RAS event types table",
-            "ReferencedInventory": "Event Type Lookup Failure",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": false
-        },
-        "External Software||Network Error": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Interconnect Networking",
-            "BMCMessageID": "External Software",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPIN0001M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Connection Error. View additional details for more information",
-            "ReferencedInventory": "Network Error",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": true
-        },
-        "org.open_power.Host.Access.Error.ReadCFAM": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.Host.Access.Error.ReadCFAM",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0044F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Failure to write to host CFAM interface",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Access.Error.WriteCFAM": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.Host.Access.Error.WriteCFAM",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0043F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Failure to read from host CFAM interface",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Boot.Error.Checkstop": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Canister/Appliance",
-            "BMCMessageID": "org.open_power.Host.Boot.Error.Checkstop",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPAA0007G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "A system checkstop occurred",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Boot.Error.WatchdogTimedOut": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.Host.Boot.Error.WatchdogTimedOut",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0023M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Hostboot has become unresponsive",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Checkstop": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Canister/Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.Checkstop",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPAA0007G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "A system checkstop occurred",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Canister/Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPAA0011M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "An error was detected with the base platform, but was not able to be deciphered. Contact your next level of support.",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Canister/Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPAA0008M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Hostboot procedure callout",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0090M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 0 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 1 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,10",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 10 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,11",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 11 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,12",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 12 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,13",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 13 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,14",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 14 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,15",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 15 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core16": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,16",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 16 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core16",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core17": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,17",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 17 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core17",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core18": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,18",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 18 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core18",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core19": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,19",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 19 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core19",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,2",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 2 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core20": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,20",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 20 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core20",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core21": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,21",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 21 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core21",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core22": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,22",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 22 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core22",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core23": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,23",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 23 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core23",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,3",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 3 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,4",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 4 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,5",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 5 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,6",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 6 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,7",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 7 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,8",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 8 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,9",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 9 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0090M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 0 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 1 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,10",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 10 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,11",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 11 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,12",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 12 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,13",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 13 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,14",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 14 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,15",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 15 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core16": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,16",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 16 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core16",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core17": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,17",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 17 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core17",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core18": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,18",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 18 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core18",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core19": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,19",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 19 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core19",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,2",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 2 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core20": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,20",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 20 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core20",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core21": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,21",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 21 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core21",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core22": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,22",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 22 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core22",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core23": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,23",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 23 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core23",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,3",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 3 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,4",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 4 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,5",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 5 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,6",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 6 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,7",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 7 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,8",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 8 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,9",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 9 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 0 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 1 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 10,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 10 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 11,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 11 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 12,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 12 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 13,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 13 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 14,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 14 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 15,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 15 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 2 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 3 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 4 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 5 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 6,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 6 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 7,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 7 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 8,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 8 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 9,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 9 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCR0003M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "A system firmware error occurred.",
-            "ReferencedInventory": 0,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Canister/Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPAA0000M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "A vital system component has been disabled",
-            "ReferencedInventory": 1,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Canister/Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPAA0001M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "An unknown problem occurred",
-            "ReferencedInventory": 10,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0029M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "A system firmware error occurred.",
-            "ReferencedInventory": 11,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||16": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0007M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "A system firmware error occurred.",
-            "ReferencedInventory": 16,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||1C": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0008M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "A system firmware error occurred.",
-            "ReferencedInventory": "1C",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||22": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0044M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "A memory configuration error has been detected.",
-            "ReferencedInventory": 22,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||2D": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0060M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "A FSI path error has occurred.",
-            "ReferencedInventory": "2D",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||30": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0061M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "An external processor interface problem has occurred",
-            "ReferencedInventory": 30,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||31": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0062M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "An internal processor interface problem has occurred",
-            "ReferencedInventory": 31,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||34": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0058M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "A memory bus error occurred.",
-            "ReferencedInventory": 34,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||37": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "System Board",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPSB0005M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "A bus error occurred.",
-            "ReferencedInventory": 37,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||3F": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0012M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "A system power problem has occurred",
-            "ReferencedInventory": "3F",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0004M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "A system firmware error occurred.",
-            "ReferencedInventory": 4,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||4D": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Canister/Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPAA0009M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "System performance is degraded",
-            "ReferencedInventory": "4D",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||4F": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0045M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "An uncorrectable memory problem occurred.",
-            "ReferencedInventory": "4F",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0005M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "A system firmware error occurred.",
-            "ReferencedInventory": 5,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||55": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0011M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "The service processor detected a problem during the early boot process",
-            "ReferencedInventory": 55,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||56": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Time Reference",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPTR0001M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "A problem with the time of day clock and or clock function has been detected.",
-            "ReferencedInventory": 56,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||5C": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPU0063M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "One or more processor sensors detected an over temperature condition.",
-            "ReferencedInventory": "5C",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||5D": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0028M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Not Valid",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Unable to verify the system firmware",
-            "ReferencedInventory": "5D",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||5E": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0092M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "An error occurred with a GPU and automated isolation was not possible",
-            "ReferencedInventory": "5E",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0059M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "A CPU problem was detected.",
-            "ReferencedInventory": 8,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0043M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "An error occurred with a memory DIMM and automated isolation was not possible",
-            "ReferencedInventory": 9,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.MaintenanceProcedure||A": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.MaintenanceProcedure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0006M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "A system firmware error occurred.",
-            "ReferencedInventory": "A",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Error.WatchdogTimedOut": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.Host.Error.WatchdogTimedOut",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0023M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Hostboot has become unresponsive",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Canister/Appliance",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPAA0008M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Hostboot procedure callout",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0090M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 0 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 1 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,10",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 10 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,11",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 11 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,12",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 12 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,13",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 13 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,14",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 14 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,15",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 15 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core16": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,16",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 16 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core16",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core17": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,17",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 17 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core17",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core18": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,18",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 18 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core18",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core19": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,19",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 19 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core19",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,2",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 2 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core20": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,20",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 20 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core20",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core21": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,21",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 21 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core21",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core22": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,22",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 22 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core22",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core23": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,23",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 23 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core23",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,3",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 3 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,4",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 4 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,5",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 5 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,6",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 6 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,7",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 7 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,8",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 8 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,9",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 9 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0090M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 0 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 1 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,10",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 10 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,11",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 11 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,12",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 12 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,13",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 13 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,14",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 14 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,15",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 15 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core16": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,16",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 16 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core16",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core17": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,17",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 17 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core17",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core18": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,18",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 18 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core18",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core19": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,19",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 19 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core19",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,2",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 2 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core20": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,20",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 20 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core20",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core21": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,21",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 21 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core21",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core22": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,22",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 22 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core22",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core23": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,23",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 23 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core23",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,3",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 3 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,4",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 4 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,5",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 5 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,6",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 6 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,7",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 7 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,8",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 8 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,9",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 9 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 0 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 1 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 10,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 10 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 11,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 11 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 12,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 12 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 13,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 13 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 14,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 14 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 15,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 15 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 2 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 3 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 4 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 5 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 6,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 6 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 7,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 7 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 8,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 8 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "org.open_power.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 9,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 9 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.OCC.Device.Error.ConfigFailure": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.OCC.Device.Error.ConfigFailure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCR0048M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Failure to configure OCC",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.OCC.Device.Error.OpenFailure": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.OCC.Device.Error.OpenFailure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCR0045M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Failed to open OCC connection",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.OCC.Device.Error.ReadFailure": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.OCC.Device.Error.ReadFailure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCR0046M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Failed to read from OCC",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.OCC.Device.Error.WriteFailure": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.OCC.Device.Error.WriteFailure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCR0047M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Failed to write to OCC",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.OCC.Metrics.Error.Event": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "org.open_power.OCC.Metrics.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCR0049M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Error working with OCC metric data",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Proc.FSI.Error.MasterDetectionFailure||FSI": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Proc.FSI.Error.MasterDetectionFailure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0093M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to detect master processor on FSI bus",
-            "ReferencedInventory": "FSI",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Proc.FSI.Error.SlaveDetectionFailure": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "org.open_power.Proc.FSI.Error.SlaveDetectionFailure",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0094M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to detect slave processor on FSI bus",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 0 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 1 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 2 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 3 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 4 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 5 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 0 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": "Cooling",
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 1 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": "Cooling",
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 2 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": "Cooling",
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 3 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": "Cooling",
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 4 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": "Cooling",
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 5 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": "Cooling",
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 0 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 1 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 2 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 3 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 4 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 5 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 0 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": "Power",
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 1 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": "Power",
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 2 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": "Power",
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 3 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": "Power",
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 4 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": "Power",
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 5 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": "Power",
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerOnFailure": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerOnFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The system power failed to turn on",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerFault": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0041M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerPGOODFault||GPU_PGOOD": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerPGOODFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0045M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a GPU_PGOOD fault",
-            "ReferencedInventory": "GPU_PGOOD",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerPGOODFault||MEM_GOOD0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerPGOODFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0043M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a MEM_GOOD0 fault",
-            "ReferencedInventory": "MEM_GOOD0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerPGOODFault||MEM_GOOD1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerPGOODFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0044M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a MEM_GOOD1 fault",
-            "ReferencedInventory": "MEM_GOOD1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerPGOODFault||PGOOD_5P0V": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerPGOODFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0042M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a PGOOD_5P0V fault",
-            "ReferencedInventory": "PGOOD_5P0V",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerPGOODFault||TH_OVERT": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerPGOODFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0046M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a TH_OVERT fault",
-            "ReferencedInventory": "TH_OVERT",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||0.9V": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0053M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on 0.9V rail.",
-            "ReferencedInventory": "0.9V",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||1.0V": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0052M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on 1.0V rail.",
-            "ReferencedInventory": "1.0V",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||1.1V": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0051M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on 1.1V rail.",
-            "ReferencedInventory": "1.1V",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||1.8V": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0050M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on 1.8V rail.",
-            "ReferencedInventory": "1.8V",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||12.0V": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0048M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on 12.0V rail.",
-            "ReferencedInventory": "12.0V",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||3.3V": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0049M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on 3.3V rail.",
-            "ReferencedInventory": "3.3V",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||5.0VCS": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0047M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on 5.0VCS rail.",
-            "ReferencedInventory": "5.0VCS",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||AVDD": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0056M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on AVDD rail.",
-            "ReferencedInventory": "AVDD",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||VCS-A": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0061M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VCS-A rail.",
-            "ReferencedInventory": "VCS-A",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||VCS-B": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0062M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VCS-B rail.",
-            "ReferencedInventory": "VCS-B",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||VDD-A": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0059M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VDD-A rail.",
-            "ReferencedInventory": "VDD-A",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||VDD-B": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0060M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VDD-B rail.",
-            "ReferencedInventory": "VDD-B",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||VDN-A": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0054M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VDN-A rail.",
-            "ReferencedInventory": "VDN-A",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||VDN-B": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0055M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VDN-B rail.",
-            "ReferencedInventory": "VDN-B",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||VIO-A": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0057M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VIO-A rail.",
-            "ReferencedInventory": "VIO-A",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault||VIO-B": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0058M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VIO-B rail.",
-            "ReferencedInventory": "VIO-B",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyFanFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyFanFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCA0064M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 fan has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyFanFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyFanFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCA0064M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 fan has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyFanFault||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyFanFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCA0064M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 fan has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyFanFault||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyFanFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCA0064M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 fan has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0064M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply input fault detected, but unable to isolate to a specific power supply",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0033M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 input fault detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0033M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 input fault detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0033M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 input fault detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyInputFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0033M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 input fault detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0035M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 output current is too high",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0035M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 output current is too high",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0035M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 output current is too high",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvercurrent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0035M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 output current is too high",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0036M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 output voltage is too high",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0036M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 output voltage is too high",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0036M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 output voltage is too high",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyOutputOvervoltage",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0036M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 output voltage is too high",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0034M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 has failed to power on when it needed to",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0034M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 has failed to power on",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0034M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 has failed to power on when it needed to",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyShouldBeOn",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0034M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 has failed to power on",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0065M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 is too hot",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0065M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 is too hot",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0065M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 is too hot",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyTemperatureFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0065M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 is too hot",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0009M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 input voltage out of range",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0009M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 input voltage out of range",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0009M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 input voltage out of range",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.PowerSupplyUnderVoltageFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0009M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 input voltage out of range",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.Shutdown": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.Shutdown",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0063G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The system unexpectedly shutdown.",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.Shutdown||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.Shutdown",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0037M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 has initiated a power off due to a failure",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.Shutdown||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.Shutdown",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0037M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 has initiated a power off due to a failure",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.Shutdown||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.Shutdown",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0037M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 has initiated a power off due to a failure",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.Error.Shutdown||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.Shutdown",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0037M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 has initiated a power off due to a failure",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 0 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 1 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 2 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 3 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 4 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 5 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 0 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 1 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 2 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 3 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 4 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "org.open_power.Witherspoon.Fault.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "org.open_power.Witherspoon.Fault.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 5 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Callout.Error.Device||FSI": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Callout.Error.Device",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0042F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "An error occurred on the FSI interface",
-            "ReferencedInventory": "FSI",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Callout.Error.Device||I2C": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Callout.Error.Device",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0041F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "An error occurred on the I2C interface",
-            "ReferencedInventory": "I2C",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Callout.Error.GPIO||GPIO": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Callout.Error.GPIO",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0039F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "An error occurred on the GPIO interface",
-            "ReferencedInventory": "GPIO",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Callout.Error.IIC||I2C": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Callout.Error.IIC",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0041F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "An error occurred on the I2C interface",
-            "ReferencedInventory": "I2C",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Callout.Error.IPMISensor||IPMI": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Callout.Error.IPMISensor",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0040F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "An error occurred working with an IPMI sensor",
-            "ReferencedInventory": "IPMI",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Device.Error.ReadFailure||FSI": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0033G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Failed to read from FSI Device",
-            "ReferencedInventory": "FSI",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Device.Error.ReadFailure||I2C": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0024G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from I2C Device",
-            "ReferencedInventory": "I2C",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Device.Error.WriteFailure||FSI": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0035G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Failed to write to FSI Device",
-            "ReferencedInventory": "FSI",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Device.Error.WriteFailure||I2C": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0034G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Failed to write to I2C Device",
-            "ReferencedInventory": "I2C",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Error.InsufficientPermission": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Error.InsufficientPermission",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0022F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Security",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The user has insufficient privileges",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Error.InternalFailure": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Error.InternalFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0021F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "An internal failure has occurred while performing an operation.",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Error.InvalidArgument": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Error.InvalidArgument",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0030F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "An invalid argument was provided to a command",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Error.Timeout": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Error.Timeout",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0020F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Monitoring Agent",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "An internal operation has timed out",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.File.Error.Open": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.File.Error.Open",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0036F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Unable to open a file in BMC filesystem.",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.File.Error.Seek": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.File.Error.Seek",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0037F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Unable to seek a file in BMC filesystem.",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.File.Error.Write": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.File.Error.Write",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0038F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Unable to write a file in BMC filesystem.",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.Error.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan0_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 0",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan0_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.Error.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan0_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 0",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan0_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.Error.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan1_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 1",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan1_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.Error.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan1_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 1",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan1_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.Error.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan2_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 2",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan2_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.Error.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan2_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 2",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan2_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.Error.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan3_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 3",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan3_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.Error.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan3_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.Error.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 3",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan3_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan0_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 0",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan0_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan0_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 0",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan0_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan1_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 1",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan1_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan1_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 1",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan1_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan2_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 2",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan2_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan2_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 2",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan2_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan3_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 3",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan3_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Device.WriteFailure||/xyz/openbmc_project/sensors/fan_tach/fan3_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Control.Device.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0057M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to set fan speed for fan 3",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan3_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Control.Host.Error.CommandNotSupported": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Control.Host.Error.CommandNotSupported",
-            "CallHomeCandidate": null,
-            "CommonEventID": "FQPSPCR0039F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "An invalid host system control command was provided.",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Dump.Create.Error.Disabled": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Data Management",
-            "BMCMessageID": "xyz.openbmc_project.Dump.Create.Error.Disabled",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPDM0000M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to create a BMC dump due to dumps being disabled on this system.",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Dump.Create.Error.QuotaExceeded": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Data Management",
-            "BMCMessageID": "xyz.openbmc_project.Dump.Create.Error.QuotaExceeded",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPDM0001M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "There is no more space available for dump files. Please delete some.",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Error.Checkstop": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Canister/Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Host.Error.Checkstop",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPAA0007G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "A system checkstop occurred",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Error.WatchdogTimedOut": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Host.Error.WatchdogTimedOut",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0023M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Hostboot has become unresponsive",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Canister/Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPAA0008M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Hostboot procedure callout",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0090M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 0 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 1 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,10",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 10 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,11",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 11 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,12",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 12 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,13",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 13 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,14",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 14 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,15",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 15 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core16": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,16",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 16 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core16",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core17": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,17",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 17 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core17",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core18": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,18",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 18 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core18",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core19": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,19",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 19 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core19",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,2",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 2 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core20": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,20",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 20 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core20",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core21": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,21",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 21 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core21",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core22": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,22",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 22 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core22",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core23": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,23",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 23 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core23",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,3",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 3 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,4",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 4 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,5",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 5 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,6",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 6 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,7",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 7 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,8",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 8 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "0,9",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 9 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0090M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 0 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 1 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,10",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 10 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,11",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 11 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,12",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 12 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,13",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 13 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,14",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 14 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,15",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 15 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core16": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,16",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 16 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core16",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core17": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,17",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 17 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core17",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core18": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,18",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 18 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core18",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core19": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,19",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 19 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core19",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,2",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 2 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core20": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,20",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 20 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core20",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core21": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,21",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 21 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core21",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core22": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,22",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 22 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core22",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core23": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,23",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 23 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core23",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,3",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 3 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,4",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 4 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,5",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 5 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,6",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 6 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,7",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 7 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,8",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 8 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0091M",
-            "ComponentInstance": "1,9",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 9 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 0 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 1 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 10,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 10 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 11,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 11 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 12,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 12 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 13,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 13 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 14,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 14 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 15,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 15 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 2 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 3 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 4 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 5 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 6,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 6 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 7,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 7 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 8,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 8 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Host.Event.Error.Event||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Host.Event.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0057M",
-            "ComponentInstance": 9,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 9 has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "System Board",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPSB0001M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The system backplane has encountered a critical failure.",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0088M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 0 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 1 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,10",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 10 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,11",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 11 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,12",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 12 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,13",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 13 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,14",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 14 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,15",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 15 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core16": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,16",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 16 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core16",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core17": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,17",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 17 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core17",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core18": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,18",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 18 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core18",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core19": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,19",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 19 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core19",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,2",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 2 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core20": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,20",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 20 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core20",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core21": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,21",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 21 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core21",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core22": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,22",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 22 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core22",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core23": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,23",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 23 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core23",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,3",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 3 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,4",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 4 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,5",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 5 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,6",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 6 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,7",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 7 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,8",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 8 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "0,9",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 9 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0088M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 0 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 1 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,10",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 10 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,11",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 11 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,12",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 12 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,13",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 13 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,14",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 14 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,15",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 15 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core16": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,16",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 16 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core16",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core17": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,17",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 17 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core17",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core18": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,18",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 18 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core18",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core19": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,19",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 19 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core19",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,2",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 2 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core20": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,20",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 20 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core20",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core21": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,21",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 21 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core21",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core22": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,22",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 22 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core22",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core23": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,23",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 23 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core23",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,3",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 3 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,4",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 4 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,5",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 5 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,6",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 6 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,7",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 7 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,8",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 8 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0089M",
-            "ComponentInstance": "1,9",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 9 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 0 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 1 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 10,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 10 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 11,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 11 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 12,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 12 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 13,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 13 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 14,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 14 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 15,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 15 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 2 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 3 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 4 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 5 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 6,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 6 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 7,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 7 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 8,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 8 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPMA0056M",
-            "ComponentInstance": 9,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 9 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCA0056M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Fan 0 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCA0056M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Fan 1 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCA0056M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Fan 2 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCA0056M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Fan 3 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0022M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power Supply 0 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0022M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power Supply 1 is not functional",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "System Board",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPSB0012M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The system backplane could not be detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0085M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 0 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 1 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,10",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 10 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,11",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 11 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,12",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 12 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,13",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 13 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,14",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 14 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,15",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 15 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core16": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,16",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 16 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core16",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core17": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,17",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 17 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core17",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core18": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,18",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 18 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core18",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core19": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,19",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 19 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core19",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,2",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 2 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core20": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,20",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 20 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core20",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core21": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,21",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 21 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core21",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core22": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,22",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 22 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core22",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core23": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,23",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 23 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core23",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,3",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 3 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,4",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 4 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,5",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 5 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,6",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 6 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,7",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 7 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,8",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 8 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "0,9",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 0 core 9 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0085M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 0 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 1 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,10",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 10 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,11",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 11 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,12",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 12 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,13",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 13 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,14",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 14 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,15",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 15 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core16": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,16",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 16 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core16",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core17": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,17",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 17 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core17",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core18": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,18",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 18 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core18",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core19": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,19",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 19 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core19",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,2",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 2 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core20": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,20",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 20 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core20",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core21": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,21",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 21 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core21",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core22": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,22",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 22 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core22",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core23": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,23",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 23 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core23",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,3",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 3 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,4",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 4 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,5",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 5 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,6",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 6 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,7",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 7 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,8",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 8 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Processing",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0087M",
-            "ComponentInstance": "1,9",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "CPU 1 core 9 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 0 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 1 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 10,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 10 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 11,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 11 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 12,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 12 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 13,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 13 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 14,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 14 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 15,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 15 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 2 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 3 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 4 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 5 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 6,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 6 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 7,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 7 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 8,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 8 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Memory",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPMA0055M",
-            "ComponentInstance": 9,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "DIMM 9 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0071M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Fan 0 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0071M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Fan 1 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0071M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Fan 2 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0071M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Fan 3 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0015M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0015M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/powersupply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0015M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Inventory.Error.NotPresent||/xyz/openbmc_project/inventory/system/chassis/powersupply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.NotPresent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0015M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Uncorrectable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 has not been detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Led.Fru.Monitor.Error.InventoryPathError": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Led.Fru.Monitor.Error.InventoryPathError",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0031G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Internal error, unable to associate LED to inventory",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Led.Mapper.Error.MethodError": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Led.Mapper.Error.MethodError",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0050F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Internal method error with LED Mapper.",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Led.Mapper.Error.ObjectNotFoundError": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Led.Mapper.Error.ObjectNotFoundError",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0051F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Internal error. LED Mapper object not found.",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 0 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 1 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 2 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 3 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 4 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 5 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerOnFailure": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerOnFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The system power failed to turn on",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerFault": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0041M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerPGOODFault||GPU_PGOOD": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerPGOODFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0045M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a GPU_PGOOD fault",
-            "ReferencedInventory": "GPU_PGOOD",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerPGOODFault||MEM_GOOD0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerPGOODFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0043M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a MEM_GOOD0 fault",
-            "ReferencedInventory": "MEM_GOOD0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerPGOODFault||MEM_GOOD1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerPGOODFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0044M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a MEM_GOOD1 fault",
-            "ReferencedInventory": "MEM_GOOD1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerPGOODFault||PGOOD_5P0V": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerPGOODFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0042M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a PGOOD_5P0V fault",
-            "ReferencedInventory": "PGOOD_5P0V",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerPGOODFault||TH_OVERT": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerPGOODFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0046M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a TH_OVERT fault",
-            "ReferencedInventory": "TH_OVERT",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||0.9V": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0053M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on 0.9V rail.",
-            "ReferencedInventory": "0.9V",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||1.0V": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0052M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on 1.0V rail.",
-            "ReferencedInventory": "1.0V",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||1.1V": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0051M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on 1.1V rail.",
-            "ReferencedInventory": "1.1V",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||1.8V": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0050M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on 1.8V rail.",
-            "ReferencedInventory": "1.8V",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||12.0V": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0048M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on 12.0V rail.",
-            "ReferencedInventory": "12.0V",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||3.3V": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0049M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on 3.3V rail.",
-            "ReferencedInventory": "3.3V",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||5.0VCS": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0047M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on 5.0VCS rail.",
-            "ReferencedInventory": "5.0VCS",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||AVDD": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0056M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on AVDD rail.",
-            "ReferencedInventory": "AVDD",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||VCS-A": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0061M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VCS-A rail.",
-            "ReferencedInventory": "VCS-A",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||VCS-B": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0062M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VCS-B rail.",
-            "ReferencedInventory": "VCS-B",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||VDD-A": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0059M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VDD-A rail.",
-            "ReferencedInventory": "VDD-A",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||VDD-B": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0060M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VDD-B rail.",
-            "ReferencedInventory": "VDD-B",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||VDN-A": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0054M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VDN-A rail.",
-            "ReferencedInventory": "VDN-A",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||VDN-B": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0055M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VDN-B rail.",
-            "ReferencedInventory": "VDN-B",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||VIO-A": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0057M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VIO-A rail.",
-            "ReferencedInventory": "VIO-A",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault||VIO-B": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSequencerVoltageFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0058M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The power sequencer chip detected a fault on VIO-B rail.",
-            "ReferencedInventory": "VIO-B",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSupplyFanFault||/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyFanFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCA0064M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 fan has failed",
-            "ReferencedInventory": "/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSupplyInputFault||/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyInputFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0033M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 input fault detected",
-            "ReferencedInventory": "/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSupplyInputFault||/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyInputFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0033M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 input fault detected",
-            "ReferencedInventory": "/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSupplyOutputOvercurrent||/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyOutputOvercurrent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0035M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 output current is too high",
-            "ReferencedInventory": "/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSupplyOutputOvercurrent||/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyOutputOvercurrent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0035M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 output current is too high",
-            "ReferencedInventory": "/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSupplyOutputOvervoltage||/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyOutputOvervoltage",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0036M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 output voltage is too high",
-            "ReferencedInventory": "/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSupplyOutputOvervoltage||/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyOutputOvervoltage",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0036M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 output voltage is too high",
-            "ReferencedInventory": "/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSupplyShouldBeOn||/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyShouldBeOn",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0034M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 has failed to power on when it needed to",
-            "ReferencedInventory": "/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSupplyShouldBeOn||/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyShouldBeOn",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0034M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 has failed to power on",
-            "ReferencedInventory": "/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSupplyTemperatureFault||/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyTemperatureFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0065M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 is too hot",
-            "ReferencedInventory": "/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSupplyTemperatureFault||/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyTemperatureFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0065M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 is too hot",
-            "ReferencedInventory": "/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSupplyUnderVoltageFault||/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyUnderVoltageFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0009M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 input voltage out of range",
-            "ReferencedInventory": "/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.PowerSupplyUnderVoltageFault||/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.PowerSupplyUnderVoltageFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0009M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 input voltage out of range",
-            "ReferencedInventory": "/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.Shutdown||/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.Shutdown",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0037M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 has initiated a power off due to a failure",
-            "ReferencedInventory": "/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Error.Shutdown||/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Error.Shutdown",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0037M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 has initiated a power off due to a failure",
-            "ReferencedInventory": "/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 0 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 1 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 2 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 3 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 4 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUOverTemp",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0066M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 5 suffered an over-temperature fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 0 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 1 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu2": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 2 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu2",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu3": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 3 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu3",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu4": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 4 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu4",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu5": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.GPUPowerFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "GPU 5 suffered a power fault",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu5",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.PowerSupplyFanFault||/xyz/openbmc_project/inventory/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyFanFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCA0064M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 fan has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.PowerSupplyFanFault||/xyz/openbmc_project/inventory/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyFanFault",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCA0064M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 fan has failed",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.PowerSupplyInputFault||/xyz/openbmc_project/inventory/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyInputFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0033M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 input fault detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.PowerSupplyInputFault||/xyz/openbmc_project/inventory/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyInputFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0033M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 input fault detected",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.PowerSupplyOutputOvercurrent||/xyz/openbmc_project/inventory/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyOutputOvercurrent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0035M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 output current is too high",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.PowerSupplyOutputOvercurrent||/xyz/openbmc_project/inventory/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyOutputOvercurrent",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0035M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 output current is too high",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.PowerSupplyOutputOvervoltage||/xyz/openbmc_project/inventory/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyOutputOvervoltage",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0036M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 output voltage is too high",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.PowerSupplyOutputOvervoltage||/xyz/openbmc_project/inventory/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyOutputOvervoltage",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0036M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 output voltage is too high",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.PowerSupplyShouldBeOn||/xyz/openbmc_project/inventory/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyShouldBeOn",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0034M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 has failed to power on when it needed to",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.PowerSupplyShouldBeOn||/xyz/openbmc_project/inventory/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyShouldBeOn",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0034M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 has failed to power on",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.PowerSupplyTemperatureFault||/xyz/openbmc_project/inventory/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyTemperatureFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0065M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 is too hot",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.PowerSupplyTemperatureFault||/xyz/openbmc_project/inventory/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyTemperatureFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0065M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 is too hot",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.PowerSupplyUnderVoltageFault||/xyz/openbmc_project/inventory/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyUnderVoltageFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0009M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 input voltage out of range",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.PowerSupplyUnderVoltageFault||/xyz/openbmc_project/inventory/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.PowerSupplyUnderVoltageFault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0009M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 input voltage out of range",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Shutdown||/xyz/openbmc_project/inventory/system/chassis/power_supply0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Shutdown",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0037M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 0 has initiated a power off due to a failure",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Power.Fault.Shutdown||/xyz/openbmc_project/inventory/system/chassis/power_supply1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Power.Fault.Shutdown",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPW0037M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Power supply 1 has initiated a power off due to a failure",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/power_supply1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan0_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "0,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 0 rotor 0 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan0_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan0_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "0,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 0 rotor 1 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan0_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan1_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "1,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 1 rotor 0 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan1_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan1_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "1,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 1 rotor 1 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan1_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan2_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "2,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 2 rotor 0 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan2_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan2_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "2,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 2 rotor 1 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan2_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan3_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "3,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 3 rotor 0 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan3_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan3_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "3,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 3 rotor 1 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan3_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/ambient": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0059M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read ambient temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/ambient",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm0_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 0 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm0_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm10_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 10,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 10 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm10_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm11_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 11,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 11 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm11_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm12_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 12,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 12 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm12_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm13_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 13,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 13 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm13_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm14_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 14,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 14 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm14_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm15_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 15,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 15 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm15_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm1_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 1 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm1_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm2_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 2 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm2_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm3_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 3 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm3_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm4_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 4 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm4_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm5_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 5 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm5_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm6_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 6,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 6 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm6_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm7_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 7,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 7 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm7_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm8_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 8,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 8 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm8_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm9_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 9,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 9 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm9_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu0_core_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 0 core temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu0_core_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu0_mem_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 0 memory temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu0_mem_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu1_core_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 1 core temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu1_core_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu1_mem_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 1 memory temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu1_mem_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu2_core_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 2 core temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu2_core_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu2_mem_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 2 memory temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu2_mem_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu3_core_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 3 core temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu3_core_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu3_mem_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 3 memory temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu3_mem_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu4_core_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 4 core temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu4_core_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu4_mem_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 4 memory temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu4_mem_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu5_core_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 5 core temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu5_core_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu5_mem_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 5 memory temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu5_mem_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core0_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 0 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core0_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core10_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,10",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 10 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core10_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core11_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,11",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 11 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core11_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core12_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,12",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 12 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core12_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core13_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,13",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 13 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core13_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core14_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,14",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 14 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core14_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core15_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,15",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 15 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core15_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core16_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,16",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 16 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core16_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core17_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,17",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 17 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core17_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core18_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,18",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 18 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core18_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core19_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,19",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 19 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core19_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core1_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 1 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core1_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core20_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,20",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 20 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core20_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core21_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,21",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 21 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core21_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core22_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,22",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 22 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core22_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core23_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,23",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 23 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core23_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core2_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,2",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 2 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core2_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core3_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,3",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 3 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core3_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core4_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,4",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 4 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core4_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core5_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,5",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 5 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core5_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core6_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,6",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 6 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core6_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core7_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,7",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 7 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core7_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core8_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,8",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 8 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core8_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core9_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,9",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 9 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core9_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_vcs_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 VCS voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_vcs_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_vdd_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 VDD voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_vdd_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_vddr_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 VDDR voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_vddr_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_vdn_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 VDN voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_vdn_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core0_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 0 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core0_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core10_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,10",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 10 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core10_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core11_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,11",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 11 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core11_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core12_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,12",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 12 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core12_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core13_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,13",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 13 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core13_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core14_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,14",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 14 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core14_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core15_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,15",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 15 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core15_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core16_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,16",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 16 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core16_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core17_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,17",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 17 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core17_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core18_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,18",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 18 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core18_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core19_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,19",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 19 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core19_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core1_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 1 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core1_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core20_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,20",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 20 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core20_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core21_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,21",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 21 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core21_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core22_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,22",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 22 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core22_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core23_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,23",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 23 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core23_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core2_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,2",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 2 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core2_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core3_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,3",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 3 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core3_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core4_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,4",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 4 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core4_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core5_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,5",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 5 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core5_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core6_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,6",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 6 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core6_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core7_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,7",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 7 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core7_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core8_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,8",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 8 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core8_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core9_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,9",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 9 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core9_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_vcs_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 VCS voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_vcs_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_vdd_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 VDD voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_vdd_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_vddr_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 VDDR voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_vddr_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_vdn_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 VDN voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_vdn_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||I2C": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0024G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from I2C device",
-            "ReferencedInventory": "I2C",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/current/ps0_output_current": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0023M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read the output current from power supply 0",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/current/ps0_output_current",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/current/ps1_output_current": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0023M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read the output current from power supply 1",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/current/ps1_output_current",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan0_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "0,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 0 rotor 0 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan0_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan0_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "0,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 0 rotor 1 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan0_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan1_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "1,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 1 rotor 0 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan1_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan1_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "1,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 1 rotor 1 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan1_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan2_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "2,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 2 rotor 0 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan2_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan2_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "2,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 2 rotor 1 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan2_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan3_0": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "3,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 3 rotor 0 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan3_0",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/fan_tach/fan3_1": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0058M",
-            "ComponentInstance": "3,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read fan 3 rotor 1 speed",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/fan_tach/fan3_1",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/p0_gpu0_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0024M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 0 power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/p0_gpu0_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/p0_gpu1_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0024M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 1 power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/p0_gpu1_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/p0_gpu2_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0024M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 2 power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/p0_gpu2_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/p0_io_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0025M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 I/O power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/p0_io_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/p0_mem_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0026M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 memory power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/p0_mem_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/p0_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0027M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/p0_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/p1_gpu0_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0024M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 3 power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/p1_gpu0_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/p1_gpu1_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0024M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 4 power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/p1_gpu1_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/p1_gpu2_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0024M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 5 power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/p1_gpu2_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/p1_io_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0025M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 I/O power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/p1_io_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/p1_mem_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0026M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 memory power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/p1_mem_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/p1_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0027M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/p1_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/ps0_input_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0028M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read power supply 0 input power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/ps0_input_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/ps1_input_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0028M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read power supply 1 input power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/ps1_input_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/storage_a_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0029M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read storage 0 power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/storage_a_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/storage_b_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0029M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read storage 1 power",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/storage_b_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/power/total_power": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0030M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read total power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/power/total_power",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/ambient": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0059M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read ambient temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/ambient",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm0_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 0 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm0_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm10_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 10,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 10 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm10_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm11_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 11,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 11 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm11_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm12_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 12,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 12 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm12_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm13_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 13,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 13 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm13_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm14_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 14,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 14 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm14_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm15_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 15,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 15 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm15_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm1_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 1 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm1_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm2_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 2 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm2_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm3_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 3 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm3_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm4_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 4 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm4_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm5_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 5 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm5_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm6_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 6,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 6 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm6_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm7_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 7,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 7 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm7_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm8_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 8,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 8 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm8_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/dimm9_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0060M",
-            "ComponentInstance": 9,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read DIMM 9 power consumption",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/dimm9_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu0_core_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 0 core temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu0_core_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu0_mem_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 0 memory temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu0_mem_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu1_core_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 1 core temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu1_core_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu1_mem_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 1 memory temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu1_mem_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu2_core_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 2 core temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu2_core_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu2_mem_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 2,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 2 memory temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu2_mem_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu3_core_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 3 core temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu3_core_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu3_mem_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 3,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 3 memory temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu3_mem_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu4_core_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 4 core temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu4_core_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu4_mem_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 4,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 4 memory temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu4_mem_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu5_core_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 5 core temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu5_core_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/gpu5_mem_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0061M",
-            "ComponentInstance": 5,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read GPU 5 memory temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/gpu5_mem_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core0_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 0 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core0_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core10_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,10",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 10 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core10_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core11_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,11",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 11 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core11_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core12_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,12",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 12 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core12_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core13_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,13",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 13 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core13_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core14_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,14",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 14 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core14_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core15_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,15",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 15 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core15_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core16_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,16",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 16 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core16_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core17_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,17",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 17 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core17_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core18_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,18",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 18 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core18_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core19_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,19",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 19 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core19_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core1_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 1 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core1_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core20_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,20",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 20 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core20_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core21_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,21",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 21 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core21_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core22_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,22",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 22 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core22_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core23_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,23",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 23 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core23_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core2_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,2",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 2 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core2_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core3_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,3",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 3 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core3_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core4_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,4",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 4 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core4_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core5_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,5",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 5 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core5_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core6_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,6",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 6 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core6_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core7_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,7",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 7 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core7_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core8_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,8",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 8 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core8_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_core9_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "0,9",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 core 9 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_core9_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_vcs_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 VCS voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_vcs_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_vdd_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 VDD voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_vdd_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_vddr_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 VDDR voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_vddr_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p0_vdn_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 0 VDN voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p0_vdn_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core0_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,0",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 0 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core0_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core10_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,10",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 10 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core10_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core11_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,11",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 11 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core11_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core12_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,12",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 12 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core12_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core13_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,13",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 13 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core13_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core14_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,14",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 14 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core14_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core15_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,15",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 15 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core15_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core16_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,16",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 16 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core16_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core17_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,17",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 17 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core17_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core18_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,18",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 18 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core18_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core19_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,19",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 19 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core19_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core1_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,1",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 1 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core1_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core20_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,20",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 20 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core20_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core21_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,21",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 21 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core21_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core22_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,22",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 22 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core22_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core23_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,23",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 23 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core23_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core2_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,2",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 2 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core2_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core3_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,3",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 3 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core3_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core4_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,4",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 4 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core4_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core5_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,5",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 5 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core5_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core6_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,6",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 6 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core6_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core7_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,7",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 7 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core7_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core8_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,8",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 8 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core8_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_core9_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0062M",
-            "ComponentInstance": "1,9",
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 core 9 temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_core9_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_vcs_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 VCS voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_vcs_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_vdd_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 VDD voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_vdd_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_vddr_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 VDDR voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_vddr_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/temperature/p1_vdn_temp": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0063M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read CPU 1 VDN voltage regulator temperature",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/temperature/p1_vdn_temp",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/voltage/ps0_input_voltage": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0031M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read power supply 0 input voltage",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/voltage/ps0_output_voltage": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0032M",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read power supply 0 output voltage",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/voltage/ps1_input_voltage": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0031M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read power supply 1 input voltage",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.ReadFailure||/xyz/openbmc_project/sensors/voltage/ps1_output_voltage": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Power",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPPW0032M",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read power supply 1 output voltage",
-            "ReferencedInventory": "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Threshold.Error.CriticalHigh||temperature": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Threshold.Error.CriticalHigh",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCA0072M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Three or more CPU cores have gone over temperature, initiating  a thermal shutdown.",
-            "ReferencedInventory": "temperature",
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Software.Version.Error.InternalFailure": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Software.Version.Error.InternalFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0027G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to process the image provided",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Software.Version.Error.ManifestFileFailure": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Software.Version.Error.ManifestFileFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0025G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to read the manifest file",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Software.Version.Error.UnTarFailure": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Software.Version.Error.UnTarFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0026G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Unable to decompress the tar file",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.State.Host.Error.SoftOffTimeout": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Host Operating System",
-            "BMCMessageID": "xyz.openbmc_project.State.Host.Error.SoftOffTimeout",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPOS0000G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "The soft power off of the host has timed out",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.State.Host.SoftOffTimeout": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Host Operating System",
-            "BMCMessageID": "xyz.openbmc_project.State.Host.SoftOffTimeout",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPOS0000G",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Monitoring Agent",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "The soft power off of the host has timed out",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.State.Shutdown.Inventory.Error.Fan": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.State.Shutdown.Inventory.Error.Fan",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0067F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Unrecoverable Hardware Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "The system shut down due to not having enough functional fans.",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.State.Shutdown.Power.Error.Fault": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.State.Shutdown.Power.Error.Fault",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0068F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "The system was shut down due to a power fault being detected.",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.State.Shutdown.ThermalEvent.Error.GPU": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.State.Shutdown.ThermalEvent.Error.GPU",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0070F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "The system was shut down due to a GPU going over temperature",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.State.Shutdown.ThermalEvent.Error.Processor": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Cooling",
-            "BMCMessageID": "xyz.openbmc_project.State.Shutdown.ThermalEvent.Error.Processor",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCA0069F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Environmental",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "The system was shut down due to a processor going over temperature",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.opnbmc_project.State.Host.Error.SoftOffTimeout": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Canister/Appliance",
-            "BMCMessageID": "xyz.opnbmc_project.State.Host.Error.SoftOffTimeout",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPAA0010M",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Firmware/Software Failure",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "The host did not shutdown within the configured time",
-            "ReferencedInventory": null,
-            "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        }
-    },
-    "fileInfo": {
-        "Entity": "IBM OpenBMC",
-        "Version": "1.7.1",
-        "language": "English"
-    }
-}
\ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd.bbappend
deleted file mode 100644
index ac35ae9..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-MBOXD_FLASH_SIZE = "64M"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SYSTEMD_SERVICE_${PN} += "check-pnor-format.service"
-
-SRC_URI += "file://check_pnor_format.sh"
-
-do_install_append() {
-	install -d ${D}${bindir}
-	install -m 0755 ${WORKDIR}/check_pnor_format.sh ${D}${bindir}/check_pnor_format.sh
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd/check-pnor-format.service b/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd/check-pnor-format.service
deleted file mode 100644
index 88bf0ad..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd/check-pnor-format.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Check PNOR UBI format
-Before=mboxd.service
-
-[Service]
-ExecStart={bindir}/check_pnor_format.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-RequiredBy=mboxd.service
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd/check_pnor_format.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd/check_pnor_format.sh
deleted file mode 100644
index ec043ea..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd/check_pnor_format.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Get the mtd device number (mtdX)
-findmtd() {
-  m="$(grep -xl "$1" /sys/class/mtd/*/name)"
-  m="${m%/name}"
-  m="${m##*/}"
-  echo "${m}"
-}
-
-pnormtd="$(findmtd pnor)"
-pnor="${pnormtd#mtd}"
-pnordev="/dev/mtd${pnor}"
-
-if [[ ! "$(dd if=${pnordev} bs=1 count=3 2> /dev/null)" = "UBI" ]]; then
-  echo "${pnordev} is not formatted UBI"
-  exit 1
-fi
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/network/network.bbappend
deleted file mode 100644
index 7e0dc2f..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SYSTEMD_SERVICE_${PN} += "ncsi-netlink.service"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service b/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service
deleted file mode 100644
index f49114d..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Stop the ethernet link failover
-Wants=xyz.openbmc_project.Network.service
-After=xyz.openbmc_project.Network.service
-
-[Service]
-Restart=no
-ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0
-SyslogIdentifier=ncsi-netlink
-Type=oneshot
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
deleted file mode 100644
index 6e0db1e..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-RDEPENDS_${PN}-inventory += "openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence"
-RDEPENDS_${PN}-fan-control += "witherspoon-fan-watchdog"
-RDEPENDS_${PN}-extras += "witherspoon-pfault-analysis witherspoon-power-supply-sync phosphor-webui"
-
-${PN}-software-extras_df-obmc-ubi-fs += "phosphor-software-manager-sync"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend
deleted file mode 100644
index c4b027f..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-RDEPENDS_${PN}-fans_remove += "obmc-control-fan"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-logging-error-logs-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-logging-error-logs-native.bbappend
deleted file mode 100644
index 03646ad..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-logging-error-logs-native.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-DEPENDS += "witherspoon-pfault-analysis-error-native"
-
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis-error-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis-error-native.bb
deleted file mode 100644
index 64c551f..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis-error-native.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Copy error yaml files to known path for elog parsing"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-inherit phosphor-dbus-yaml
-
-require witherspoon-pfault-analysis.inc
-
-S = "${WORKDIR}/git"
-
-do_install_append() {
-    SRC=${S}/org/open_power/Witherspoon
-    DEST=${D}${yaml_dir}/org/open_power/Witherspoon
-    install -d ${DEST}
-    install ${SRC}/Fault.errors.yaml ${DEST}
-    install ${SRC}/Fault.metadata.yaml ${DEST}
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.bb
deleted file mode 100644
index 1d148df..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-SUMMARY = "Witherspoon Power Fault Analysis"
-DESCRIPTION = "Analyzes power devices for faults"
-PR = "r1"
-
-inherit autotools
-inherit pkgconfig
-inherit obmc-phosphor-systemd
-inherit pythonnative
-
-require ${PN}.inc
-
-S = "${WORKDIR}/git"
-
-DEPENDS += " \
-         phosphor-logging \
-         autoconf-archive-native \
-         openpower-dbus-interfaces \
-         sdbus++-native \
-         "
-
-RDEPENDS_${PN} += " \
-         phosphor-logging \
-         phosphor-dbus-interfaces \
-         sdbusplus \
-         "
-
-CHASSIS_ON_TGT = "obmc-chassis-poweron@0.target"
-SEQ_MONITOR_SVC = "witherspoon-pseq-monitor.service"
-SEQ_MONITOR_FMT = "../${SEQ_MONITOR_SVC}:${CHASSIS_ON_TGT}.wants/${SEQ_MONITOR_SVC}"
-
-SEQ_PGOOD_SVC = "witherspoon-pseq-monitor-pgood.service"
-SEQ_PGOOD_FMT = "../${SEQ_PGOOD_SVC}:${CHASSIS_ON_TGT}.wants/${SEQ_PGOOD_SVC}"
-
-SYSTEMD_SERVICE_${PN} += "${SEQ_MONITOR_SVC} ${SEQ_PGOOD_SVC}"
-SYSTEMD_LINK_${PN} += "${SEQ_MONITOR_FMT} ${SEQ_PGOOD_FMT}"
-
-PSU_MONITOR_TMPL = "witherspoon-power-supply-monitor@.service"
-PSU_MONITOR_INSTFMT = "witherspoon-power-supply-monitor@{0}.service"
-PSU_MONITOR_TGT = "${SYSTEMD_DEFAULT_TARGET}"
-PSU_MONITOR_FMT = "../${PSU_MONITOR_TMPL}:${PSU_MONITOR_TGT}.requires/${PSU_MONITOR_INSTFMT}"
-
-FILES_witherspoon-psu-monitor = "${sbindir}/witherspoon-psu-monitor"
-SYSTEMD_SERVICE_${PN} += "${PSU_MONITOR_TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
-
-PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc
deleted file mode 100644
index f047c1f..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-HOMEPAGE = "https://github.com/openbmc/witherspoon-pfault-analysis"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-SRC_URI += "git://github.com/openbmc/witherspoon-pfault-analysis"
-SRCREV = "cab4834210a92da1cd300ec12740fcb1c19dc375"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf
deleted file mode 100644
index 207eb50..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-DEVPATH=/sys/bus/i2c/devices/3-0069
-INSTANCE=0
-INVENTORY=/system/chassis/motherboard/powersupply0
-NUM_HISTORY_RECORDS=120
-SYNC_GPIO_PATH=/dev/gpiochip0
-SYNC_GPIO_NUM=105
\ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf
deleted file mode 100644
index 73efd45..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-DEVPATH=/sys/bus/i2c/devices/3-0068
-INSTANCE=1
-INVENTORY=/system/chassis/motherboard/powersupply1
-NUM_HISTORY_RECORDS=120
-SYNC_GPIO_PATH=/dev/gpiochip0
-SYNC_GPIO_NUM=105
\ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
deleted file mode 100644
index ba4e368..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Witherspoon Power Supply %I Monitor
-Wants=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-motherboard-powersupply%i.service
-After=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-motherboard-powersupply%i.service
-Wants=mapper-wait@-org-openbmc-control-power0.service
-After=mapper-wait@-org-openbmc-control-power0.service
-ConditionPathExists={envfiledir}/obmc/power-supply-monitor/power-supply-monitor-%i.conf
-
-[Service]
-EnvironmentFile={envfiledir}/obmc/power-supply-monitor/power-supply-monitor-%i.conf
-ExecStart=/usr/bin/env witherspoon-psu-monitor --path=${{DEVPATH}} --instance=${{INSTANCE}} --inventory=${{INVENTORY}} --num-history-records=${{NUM_HISTORY_RECORDS}} --sync-gpio-path=${{SYNC_GPIO_PATH}} --sync-gpio-num=${{SYNC_GPIO_NUM}}
-SyslogIdentifier=witherspoon-psu-monitor
-
-[Install]
-RequiredBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor-pgood.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor-pgood.service
deleted file mode 100644
index f18efc1..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor-pgood.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Witherspoon Power Sequencer Power-on Monitor
-Wants=op-power-start@0.service
-After=op-power-start@0.service
-Conflicts=obmc-chassis-poweroff@0.target
-ConditionPathExists=!/run/openbmc/chassis@0-on
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/env witherspoon-pseq-monitor -a pgood-monitor -i 5000
-SyslogIdentifier=witherspoon-pseq-monitor
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor.service
deleted file mode 100644
index 6e76c8f..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Witherspoon Power Sequencer Runtime Monitor
-Wants=obmc-host-start-pre@0.target
-Before=obmc-host-start-pre@0.target
-After=obmc-power-on@0.target
-Conflicts=obmc-chassis-poweroff@0.target
-
-[Service]
-ExecStart=/usr/bin/env witherspoon-pseq-monitor -a runtime-monitor -i 500
-SyslogIdentifier=witherspoon-pseq-monitor
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy-native.bb
deleted file mode 100644
index 4d234c1..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy-native.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SUMMARY = "Power supply policy for Witherspoon"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-inherit phosphor-dbus-monitor
-
-SRC_URI += "file://power-supply-policy.yaml"
-
-do_install() {
-        install -D ${WORKDIR}/power-supply-policy.yaml ${D}${config_dir}/power-supply-policy.yaml
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml
deleted file mode 100644
index 20141c9..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml
+++ /dev/null
@@ -1,215 +0,0 @@
-# Witherspoon power supply policy for PDM.
-#
-# Create an error if a power supply is removed while the system is powered on
-
-- name: power supply0
-  class: group
-  group: path
-  members:
-    - meta: POWER SUPPLY
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0
-
-- name: power supply1
-  class: group
-  group: path
-  members:
-    - meta: POWER SUPPLY
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1
-
-- name: power supplies
-  description: >
-    'A Witherspoon has two power supplies to monitor.'
-  class: group
-  group: path
-  members:
-    - meta: POWER SUPPLY
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0
-    - meta: POWER SUPPLY
-      path: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1
-
-- name: chassis state
-  description: >
-    'A Witherspoon has a single chassis to monitor.'
-  class: group
-  group: path
-  members:
-    - meta: CHASSISSTATE
-      path: /xyz/openbmc_project/state/chassis0
-
-- name: power supply present
-  description: >
-    'Monitor the presence state of each power supply.'
-  class: group
-  group: property
-  type: boolean
-  members:
-    - interface: xyz.openbmc_project.Inventory.Item
-      meta: PRESENT
-      property: Present
-
-- name: chassis powered
-  description: >
-    'Monitor the chassis power state.'
-  class: group
-  group: property
-  type: string
-  members:
-    - interface: xyz.openbmc_project.State.Chassis
-      meta: CHASSIS_STATE
-      property: CurrentPowerState
-
-- name: watch power supply present
-  description: >
-    'Trigger logic on power supply presence state changes.'
-  class: watch
-  watch: property
-  paths: power supplies
-  properties: power supply present
-  callback: check power
-
-- name: watch chassis state
-  description: >
-    'Trigger logic on chassis power state changes.'
-  class: watch
-  watch: property
-  paths: chassis state
-  properties: chassis powered
-  callback: check power
-
-- name: check power
-  description: >
-    'If the chassis has power, check for power supplies.'
-  class: condition
-  condition: count
-  paths: chassis state
-  properties: chassis powered
-  callback: check power supplies
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: xyz.openbmc_project.State.Chassis.PowerState.On
-
-- name: check power supplies
-  description: >
-    'Create an error if a power supply is not present.'
-  class: callback
-  callback: group
-  members:
-    - check power supply0 presence
-    - check power supply1 presence
-
-- name: check power supply0 presence
-  description: >
-    'If this condition passes power supply0 has been unplugged for more than
-     5 seconds. Count present power supplies rather than non-present
-     power supplies since the latter would pass if the power supply has not
-     been created for some reason.
-
-    For a more detailed definition of unplugged, consult the documentation
-    of xyz.openbmc_project.Inventory.Item and/or the documentation
-    of the power supply inventory object implementation.'
-  class: condition
-  condition: count
-  paths: power supply0
-  properties: power supply present
-  defer: 5000000us
-  callback: notpresent power supply0 error
-  countop: '<'
-  countbound: 1
-  op: '=='
-  bound: true
-
-- name: check power supply1 presence
-  description: >
-    'If this condition passes power supply1 has been unplugged for more than
-     5 seconds.'
-  class: condition
-  condition: count
-  paths: power supply1
-  properties: power supply present
-  defer: 5000000us
-  callback: notpresent power supply1 error
-  countop: '<'
-  countbound: 1
-  op: '=='
-  bound: true
-
-- name: notpresent power supply0 error
-  class: callback
-  callback: elog
-  paths: power supply0
-  properties: power supply present
-  error: xyz::openbmc_project::Inventory::Error::NotPresent
-  metadata:
-    - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH
-      value: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0
-      type: string
-
-- name: notpresent power supply1 error
-  class: callback
-  callback: elog
-  paths: power supply1
-  properties: power supply present
-  error: xyz::openbmc_project::Inventory::Error::NotPresent
-  metadata:
-    - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH
-      value: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1
-      type: string
-
-- name: resolve power supply0 errors if present
-  description: >
-    'If power supply0 is present, call the resolve ps0 errors callback.'
-  class: condition
-  condition: count
-  paths: power supply0
-  properties: power supply present
-  callback: resolve power supply0 errors
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: true
-
-- name: resolve power supply1 errors if present
-  description: >
-    'If power supply1 is present, call the resolve ps1 errors callback.'
-  class: condition
-  condition: count
-  paths: power supply1
-  properties: power supply present
-  callback: resolve power supply1 errors
-  countop: '>'
-  countbound: 0
-  op: '=='
-  bound: true
-
-- name: resolve power supply0 errors
-  class: callback
-  callback: resolve callout
-  paths: power supply0
-  properties: power supply present
-  callout: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0
-
-- name: resolve power supply1 errors
-  class: callback
-  callback: resolve callout
-  paths: power supply1
-  properties: power supply present
-  callout: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1
-
-- name: watch power supply0 present for resolving error logs
-  description: >
-    'On supply present state changes, check if errors need to be resolved.'
-  class: watch
-  watch: property
-  paths: power supply0
-  properties: power supply present
-  callback: resolve power supply0 errors if present
-
-- name: watch power supply1 present for resolving error logs
-  description: >
-    'On supply present state changes, check if errors need to be resolved.'
-  class: watch
-  watch: property
-  paths: power supply1
-  properties: power supply present
-  callback: resolve power supply1 errors if present
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync.bb
deleted file mode 100644
index b0903e7..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "Witherspoon Power Supply Sync"
-DESCRIPTION = "Synchronizes the power supplies' INPUT_HISTORY data"
-PR = "r1"
-
-inherit obmc-phosphor-license
-inherit obmc-phosphor-systemd
-
-RDEPENDS_${PN} += "virtual/obmc-gpio-monitor"
-
-SYNC_SERVICE = "witherspoon-power-supply-sync.service"
-TGTFMT = "obmc-chassis-poweron@0.target"
-SYNC_FMT = "../${SYNC_SERVICE}:${TGTFMT}.wants/${SYNC_SERVICE}"
-
-SYSTEMD_SERVICE_${PN} += "${SYNC_SERVICE}"
-SYSTEMD_LINK_${PN} += "${SYNC_FMT}"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync/witherspoon-power-supply-sync.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync/witherspoon-power-supply-sync.service
deleted file mode 100644
index 005a014..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync/witherspoon-power-supply-sync.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Witherspoon Power Supply Input History SYNC
-Wants=obmc-power-start-pre@0.target
-After=obmc-power-start-pre@0.target
-Wants=obmc-chassis-poweron@0.target
-Before=obmc-chassis-poweron@0.target
-ConditionPathExists=!/run/openbmc/chassis@0-on
-
-[Service]
-ExecStart=/usr/bin/env phosphor-gpio-util --gpio=105 --path=/dev/gpiochip0 --delay=5 --action=low_high
-SyslogIdentifier=witherspoon-power-supply-sync
-
-[Install]
-RequiredBy=obmc-chassis-poweron@0.target
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
deleted file mode 100644
index 584418c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ /dev/null
@@ -1,47 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " \
-           file://70-hwmon.rules \
-           file://70-max31785-hwmon.rules \
-           file://start_max31785_hwmon.sh \
-           "
-
-WSPOON_CHIPS = " \
-               i2c@1e78a000/i2c-bus@100/bmp280@77 \
-               i2c@1e78a000/i2c-bus@100/dps310@76 \
-               i2c@1e78a000/i2c-bus@100/max31785@52_air \
-               i2c@1e78a000/i2c-bus@100/max31785@52_water \
-               i2c@1e78a000/i2c-bus@100/power-supply@68 \
-               i2c@1e78a000/i2c-bus@100/power-supply@69 \
-               i2c@1e78a000/i2c-bus@140/ir35221@70 \
-               i2c@1e78a000/i2c-bus@140/ir35221@71 \
-               i2c@1e78a000/i2c-bus@180/ir35221@70 \
-               i2c@1e78a000/i2c-bus@180/ir35221@71 \
-               i2c@1e78a000/i2c-bus@380/tmp275@4a \
-               "
-WSPOON_ITEMSFMT = "ahb/apb/{0}.conf"
-WSPOON_ITEMS = "${@compose_list(d, 'WSPOON_ITEMSFMT', 'WSPOON_CHIPS')}"
-
-WSPOON_OCCS = " \
-              00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \
-              00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \
-              "
-WSPOON_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf"
-WSPOON_OCCITEMS = "${@compose_list(d, 'WSPOON_OCCSFMT', 'WSPOON_OCCS')}"
-
-ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'WSPOON_ITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'WSPOON_OCCITEMS')}"
-
-SYSTEMD_ENVIRONMENT_FILE_max31785-msl += "obmc/hwmon-max31785/wspoon.conf"
-SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:${SYSTEMD_DEFAULT_TARGET}.wants/phosphor-max31785-msl@wspoon.service"
-
-SYSTEMD_SERVICE_${PN} += "max31785-hwmon-helper@.service"
-
-do_install_append() {
-    install -d ${D}/${base_libdir}/udev/rules.d/
-    install ${WORKDIR}/70-max31785-hwmon.rules ${D}/${base_libdir}/udev/rules.d/
-
-    install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/start_max31785_hwmon.sh ${D}${bindir}
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/70-hwmon.rules b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/70-hwmon.rules
deleted file mode 100755
index 548b219..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/70-hwmon.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBSYSTEM=="hwmon", ACTION=="add", ENV{OF_NAME}!="max31785", RUN="/usr/bin/start_hwmon.sh start %p %E{OF_FULLNAME}"
-SUBSYSTEM=="hwmon", ACTION=="remove", RUN="/usr/bin/start_hwmon.sh stop %p %E{OF_FULLNAME}"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/70-max31785-hwmon.rules b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/70-max31785-hwmon.rules
deleted file mode 100755
index e1c3172..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/70-max31785-hwmon.rules
+++ /dev/null
@@ -1 +0,0 @@
-SUBSYSTEM=="hwmon", ACTION=="add", ENV{OF_NAME}=="max31785", RUN="/bin/systemctl start max31785-hwmon-helper@%E{OF_FULLNAME}.service"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/max31785-hwmon-helper@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/max31785-hwmon-helper@.service
deleted file mode 100644
index 98b5541..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/max31785-hwmon-helper@.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=MAX31785 hwmon helper
-Wants=phosphor-cooling-type@0.service
-After=phosphor-cooling-type@0.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/env start_max31785_hwmon.sh %I
-SyslogIdentifier=max31785-hwmon-helper
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/wspoon.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/wspoon.conf
deleted file mode 100644
index 409a75f..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/wspoon.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-BUS=3
-PATHS="/system/chassis/motherboard/fan0 /system/chassis/motherboard/fan1 /system/chassis/motherboard/fan2 /system/chassis/motherboard/fan3"
-REVISION=0x3040
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/bmp280@77.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/bmp280@77.conf
deleted file mode 100644
index cdf8b47..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/bmp280@77.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-LABEL_temp1 = "ambient"
-WARNHI_temp1 = "25000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "35000"
-CRITLO_temp1 = "0"
-OFFSET_temp1 = "-2000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/dps310@76.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/dps310@76.conf
deleted file mode 100644
index cdf8b47..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/dps310@76.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-LABEL_temp1 = "ambient"
-WARNHI_temp1 = "25000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "35000"
-CRITLO_temp1 = "0"
-OFFSET_temp1 = "-2000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_air.conf
deleted file mode 100644
index 0aafc9b..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_air.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-LABEL_fan1 = "fan0_0"
-CRITLO_fan1 = "2974"
-CRITHI_fan1 = "12076"
-
-LABEL_fan2 = "fan1_0"
-CRITLO_fan2 = "2974"
-CRITHI_fan2 = "12076"
-
-LABEL_fan3 = "fan2_0"
-CRITLO_fan3 = "2974"
-CRITHI_fan3 = "12076"
-
-LABEL_fan4 = "fan3_0"
-CRITLO_fan4 = "2974"
-CRITHI_fan4 = "12076"
-
-LABEL_fan5 = "fan0_1"
-CRITLO_fan5 = "2974"
-CRITHI_fan5 = "12076"
-
-LABEL_fan6 = "fan1_1"
-CRITLO_fan6 = "2974"
-CRITHI_fan6 = "12076"
-
-LABEL_fan7 = "fan2_1"
-CRITLO_fan7 = "2974"
-CRITHI_fan7 = "12076"
-
-LABEL_fan8 = "fan3_1"
-CRITLO_fan8 = "2974"
-CRITHI_fan8 = "12076"
-
-TARGET_MODE = "RPM"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_water.conf
deleted file mode 100644
index 5c0efe4..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_water.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-LABEL_fan1 = "fan0_0"
-CRITLO_fan1 = "2549"
-CRITHI_fan1 = "12076"
-
-LABEL_fan3 = "fan2_0"
-CRITLO_fan3 = "2549"
-CRITHI_fan3 = "12076"
-
-LABEL_fan4 = "fan3_0"
-CRITLO_fan4 = "2549"
-CRITHI_fan4 = "12076"
-
-LABEL_fan5 = "fan0_1"
-CRITLO_fan5 = "2549"
-CRITHI_fan5 = "12076"
-
-LABEL_fan7 = "fan2_1"
-CRITLO_fan7 = "2549"
-CRITHI_fan7 = "12076"
-
-LABEL_fan8 = "fan3_1"
-CRITLO_fan8 = "2549"
-CRITHI_fan8 = "12076"
-
-TARGET_MODE = "RPM"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf
deleted file mode 100644
index e463b51..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-LABEL_in1="ps1_input_voltage"
-WARNHI_in1="290000"
-WARNLO_in1="200000"
-CRITHI_in1="300000"
-CRITLO_in1="180000"
-
-LABEL_in2="ps1_output_voltage"
-WARNHI_in2="12700"
-WARNLO_in2="0"
-CRITHI_in2="13000"
-CRITLO_in2="0"
-
-LABEL_curr1="ps1_output_current"
-WARNHI_curr1="170000"
-WARNLO_curr1="0"
-CRITHI_curr1="180000"
-CRITLO_curr1="0"
-
-LABEL_power1="ps1_input_power"
-WARNHI_power1="2350000000"
-WARNLO_power1="0"
-CRITHI_power1="2500000000"
-CRITLO_power1="0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf
deleted file mode 100644
index 2fadbde..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-LABEL_in1="ps0_input_voltage"
-WARNHI_in1="290000"
-WARNLO_in1="200000"
-CRITHI_in1="300000"
-CRITLO_in1="180000"
-
-LABEL_in2="ps0_output_voltage"
-WARNHI_in2="12700"
-WARNLO_in2="0"
-CRITHI_in2="13000"
-CRITLO_in2="0"
-
-LABEL_curr1="ps0_output_current"
-WARNHI_curr1="170000"
-WARNLO_curr1="0"
-CRITHI_curr1="180000"
-CRITLO_curr1="0"
-
-LABEL_power1="ps0_input_power"
-WARNHI_power1="2350000000"
-WARNLO_power1="0"
-CRITHI_power1="2500000000"
-CRITLO_power1="0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@70.conf
deleted file mode 100644
index 6f15a5d..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@70.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-LABEL_temp1 = "p0_vdd_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_temp2 = "p0_vcs_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
\ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@71.conf
deleted file mode 100644
index eee7d51..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@71.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-LABEL_temp1 = "p0_vdn_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_temp2 = "p0_vddr_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
\ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@70.conf
deleted file mode 100644
index 0a7bce0..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@70.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-LABEL_temp1 = "p1_vdd_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_temp2 = "p1_vcs_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
\ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@71.conf
deleted file mode 100644
index 433cd67..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@71.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-LABEL_temp1 = "p1_vdn_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_temp2 = "p1_vddr_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
\ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@380/tmp275@4a.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@380/tmp275@4a.conf
deleted file mode 100644
index 3af0928..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@380/tmp275@4a.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_temp1 = "pcie"
-WARNHI_temp1 = "60000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "70000"
-CRITLO_temp1 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
deleted file mode 100644
index c7ea311..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ /dev/null
@@ -1,338 +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"
-MODE_temp33 = "label"
-MODE_temp34 = "label"
-MODE_temp35 = "label"
-MODE_temp36 = "label"
-MODE_temp37 = "label"
-MODE_temp38 = "label"
-
-MODE_power1 = "function_id"
-MODE_power2 = "function_id"
-MODE_power3 = "function_id"
-MODE_power4 = "function_id"
-MODE_power5 = "function_id"
-MODE_power6 = "function_id"
-MODE_power7 = "function_id"
-MODE_power8 = "function_id"
-MODE_power9 = "function_id"
-MODE_power10 = "function_id"
-MODE_power11 = "function_id"
-MODE_power12 = "function_id"
-MODE_power13 = "function_id"
-MODE_power14 = "function_id"
-MODE_power15 = "function_id"
-
-REMOVERCS = "11"
-
-LABEL_temp17 = "p0_core0_temp"
-WARNHI_temp17 = "78000"
-WARNLO_temp17 = "0"
-CRITHI_temp17 = "83000"
-CRITLO_temp17 = "0"
-
-LABEL_temp20 = "p0_core1_temp"
-WARNHI_temp20 = "78000"
-WARNLO_temp20 = "0"
-CRITHI_temp20 = "83000"
-CRITLO_temp20 = "0"
-
-LABEL_temp23 = "p0_core2_temp"
-WARNHI_temp23 = "78000"
-WARNLO_temp23 = "0"
-CRITHI_temp23 = "83000"
-CRITLO_temp23 = "0"
-
-LABEL_temp26 = "p0_core3_temp"
-WARNHI_temp26 = "78000"
-WARNLO_temp26 = "0"
-CRITHI_temp26 = "83000"
-CRITLO_temp26 = "0"
-
-LABEL_temp29 = "p0_core4_temp"
-WARNHI_temp29 = "78000"
-WARNLO_temp29 = "0"
-CRITHI_temp29 = "83000"
-CRITLO_temp29 = "0"
-
-LABEL_temp32 = "p0_core5_temp"
-WARNHI_temp32 = "78000"
-WARNLO_temp32 = "0"
-CRITHI_temp32 = "83000"
-CRITLO_temp32 = "0"
-
-LABEL_temp35 = "p0_core6_temp"
-WARNHI_temp35 = "78000"
-WARNLO_temp35 = "0"
-CRITHI_temp35 = "83000"
-CRITLO_temp35 = "0"
-
-LABEL_temp38 = "p0_core7_temp"
-WARNHI_temp38 = "78000"
-WARNLO_temp38 = "0"
-CRITHI_temp38 = "83000"
-CRITLO_temp38 = "0"
-
-LABEL_temp41 = "p0_core8_temp"
-WARNHI_temp41 = "78000"
-WARNLO_temp41 = "0"
-CRITHI_temp41 = "83000"
-CRITLO_temp41 = "0"
-
-LABEL_temp44 = "p0_core9_temp"
-WARNHI_temp44 = "78000"
-WARNLO_temp44 = "0"
-CRITHI_temp44 = "83000"
-CRITLO_temp44 = "0"
-
-LABEL_temp47 = "p0_core10_temp"
-WARNHI_temp47 = "78000"
-WARNLO_temp47 = "0"
-CRITHI_temp47 = "83000"
-CRITLO_temp47 = "0"
-
-LABEL_temp50 = "p0_core11_temp"
-WARNHI_temp50 = "78000"
-WARNLO_temp50 = "0"
-CRITHI_temp50 = "83000"
-CRITLO_temp50 = "0"
-
-LABEL_temp53 = "p0_core12_temp"
-WARNHI_temp53 = "78000"
-WARNLO_temp53 = "0"
-CRITHI_temp53 = "83000"
-CRITLO_temp53 = "0"
-
-LABEL_temp56 = "p0_core13_temp"
-WARNHI_temp56 = "78000"
-WARNLO_temp56 = "0"
-CRITHI_temp56 = "83000"
-CRITLO_temp56 = "0"
-
-LABEL_temp59 = "p0_core14_temp"
-WARNHI_temp59 = "78000"
-WARNLO_temp59 = "0"
-CRITHI_temp59 = "83000"
-CRITLO_temp59 = "0"
-
-LABEL_temp62 = "p0_core15_temp"
-WARNHI_temp62 = "78000"
-WARNLO_temp62 = "0"
-CRITHI_temp62 = "83000"
-CRITLO_temp62 = "0"
-
-LABEL_temp65 = "p0_core16_temp"
-WARNHI_temp65 = "78000"
-WARNLO_temp65 = "0"
-CRITHI_temp65 = "83000"
-CRITLO_temp65 = "0"
-
-LABEL_temp68 = "p0_core17_temp"
-WARNHI_temp68 = "78000"
-WARNLO_temp68 = "0"
-CRITHI_temp68 = "83000"
-CRITLO_temp68 = "0"
-
-LABEL_temp71 = "p0_core18_temp"
-WARNHI_temp71 = "78000"
-WARNLO_temp71 = "0"
-CRITHI_temp71 = "83000"
-CRITLO_temp71 = "0"
-
-LABEL_temp74 = "p0_core19_temp"
-WARNHI_temp74 = "78000"
-WARNLO_temp74 = "0"
-CRITHI_temp74 = "83000"
-CRITLO_temp74 = "0"
-
-LABEL_temp77 = "p0_core20_temp"
-WARNHI_temp77 = "78000"
-WARNLO_temp77 = "0"
-CRITHI_temp77 = "83000"
-CRITLO_temp77 = "0"
-
-LABEL_temp80 = "p0_core21_temp"
-WARNHI_temp80 = "78000"
-WARNLO_temp80 = "0"
-CRITHI_temp80 = "83000"
-CRITLO_temp80 = "0"
-
-LABEL_temp83 = "p0_core22_temp"
-WARNHI_temp83 = "78000"
-WARNLO_temp83 = "0"
-CRITHI_temp83 = "83000"
-CRITLO_temp83 = "0"
-
-LABEL_temp86 = "p0_core23_temp"
-WARNHI_temp86 = "78000"
-WARNLO_temp86 = "0"
-CRITHI_temp86 = "83000"
-CRITLO_temp86 = "0"
-
-LABEL_temp165 = "dimm0_temp"
-WARNHI_temp165 = "78000"
-WARNLO_temp165 = "0"
-CRITHI_temp165 = "83000"
-CRITLO_temp165 = "0"
-
-LABEL_temp167 = "dimm1_temp"
-WARNHI_temp167 = "78000"
-WARNLO_temp167 = "0"
-CRITHI_temp167 = "83000"
-CRITLO_temp167 = "0"
-
-LABEL_temp169 = "dimm2_temp"
-WARNHI_temp169 = "78000"
-WARNLO_temp169 = "0"
-CRITHI_temp169 = "83000"
-CRITLO_temp169 = "0"
-
-LABEL_temp171 = "dimm3_temp"
-WARNHI_temp171 = "78000"
-WARNLO_temp171 = "0"
-CRITHI_temp171 = "83000"
-CRITLO_temp171 = "0"
-
-LABEL_temp173 = "dimm4_temp"
-WARNHI_temp173 = "78000"
-WARNLO_temp173 = "0"
-CRITHI_temp173 = "83000"
-CRITLO_temp173 = "0"
-
-LABEL_temp175 = "dimm5_temp"
-WARNHI_temp175 = "78000"
-WARNLO_temp175 = "0"
-CRITHI_temp175 = "83000"
-CRITLO_temp175 = "0"
-
-LABEL_temp177 = "dimm6_temp"
-WARNHI_temp177 = "78000"
-WARNLO_temp177 = "0"
-CRITHI_temp177 = "83000"
-CRITLO_temp177 = "0"
-
-LABEL_temp179 = "dimm7_temp"
-WARNHI_temp179 = "78000"
-WARNLO_temp179 = "0"
-CRITHI_temp179 = "83000"
-CRITLO_temp179 = "0"
-
-LABEL_temp198 = "gpu0_core_temp"
-WARNHI_temp198 = "76000"
-WARNLO_temp198 = "0"
-CRITHI_temp198 = "81000"
-CRITLO_temp198 = "0"
-
-LABEL_temp199 = "gpu0_mem_temp"
-WARNHI_temp199 = "78000"
-WARNLO_temp199 = "0"
-CRITHI_temp199 = "83000"
-CRITLO_temp199 = "0"
-
-LABEL_temp201 = "gpu1_core_temp"
-WARNHI_temp201 = "76000"
-WARNLO_temp201 = "0"
-CRITHI_temp201 = "81000"
-CRITLO_temp201 = "0"
-
-LABEL_temp202 = "gpu1_mem_temp"
-WARNHI_temp202 = "78000"
-WARNLO_temp202 = "0"
-CRITHI_temp202 = "83000"
-CRITLO_temp202 = "0"
-
-LABEL_temp204 = "gpu2_core_temp"
-WARNHI_temp204 = "76000"
-WARNLO_temp204 = "0"
-CRITHI_temp204 = "81000"
-CRITLO_temp204 = "0"
-
-LABEL_temp205 = "gpu2_mem_temp"
-WARNHI_temp205 = "78000"
-WARNLO_temp205 = "0"
-CRITHI_temp205 = "83000"
-CRITLO_temp205 = "0"
-
-LABEL_power22 = "total_power"
-WARNHI_power22 = "3050000000"
-WARNLO_power22 = "0"
-CRITHI_power22 = "3100000000"
-CRITLO_power22 = "0"
-
-LABEL_power5 = "p0_power"
-WARNHI_power5 = "250000000"
-WARNLO_power5 = "0"
-CRITHI_power5 = "300000000"
-CRITLO_power5 = "0"
-
-LABEL_power6 = "p1_power"
-WARNHI_power6 = "250000000"
-WARNLO_power6 = "0"
-CRITHI_power6 = "300000000"
-CRITLO_power6 = "0"
-
-LABEL_power9 = "p0_io_power"
-WARNHI_power9 = "80000000"
-WARNLO_power9 = "0"
-CRITHI_power9 = "100000000"
-CRITLO_power9 = "0"
-
-LABEL_power10 = "p1_io_power"
-WARNHI_power10 = "80000000"
-WARNLO_power10 = "0"
-CRITHI_power10 = "100000000"
-CRITLO_power10 = "0"
-
-LABEL_power1 = "p0_mem_power"
-WARNHI_power1 = "250000000"
-WARNLO_power1 = "0"
-CRITHI_power1 = "300000000"
-CRITLO_power1 = "0"
-
-LABEL_power2 = "p1_mem_power"
-WARNHI_power2 = "250000000"
-WARNLO_power2 = "0"
-CRITHI_power2 = "300000000"
-CRITLO_power2 = "0"
-
-LABEL_power18 = "fan_disk_power"
-WARNHI_power18 = "375000000"
-WARNLO_power18 = "0"
-CRITHI_power18 = "400000000"
-CRITLO_power18 = "0"
-
-LABEL_power13 = "io_power"
-WARNHI_power13 = "128000000"
-WARNLO_power13 = "0"
-CRITHI_power13 = "150000000"
-CRITLO_power13 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
deleted file mode 100644
index 55b72fc..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
+++ /dev/null
@@ -1,268 +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"
-MODE_temp33 = "label"
-MODE_temp34 = "label"
-MODE_temp35 = "label"
-MODE_temp36 = "label"
-MODE_temp37 = "label"
-MODE_temp38 = "label"
-
-REMOVERCS = "11"
-
-LABEL_temp91 = "p1_core0_temp"
-WARNHI_temp91 = "78000"
-WARNLO_temp91 = "0"
-CRITHI_temp91 = "83000"
-CRITLO_temp91 = "0"
-
-LABEL_temp94 = "p1_core1_temp"
-WARNHI_temp94 = "78000"
-WARNLO_temp94 = "0"
-CRITHI_temp94 = "83000"
-CRITLO_temp94 = "0"
-
-LABEL_temp97 = "p1_core2_temp"
-WARNHI_temp97 = "78000"
-WARNLO_temp97 = "0"
-CRITHI_temp97 = "83000"
-CRITLO_temp97 = "0"
-
-LABEL_temp100 = "p1_core3_temp"
-WARNHI_temp100 = "78000"
-WARNLO_temp100 = "0"
-CRITHI_temp100 = "83000"
-CRITLO_temp100 = "0"
-
-LABEL_temp103 = "p1_core4_temp"
-WARNHI_temp103 = "78000"
-WARNLO_temp103 = "0"
-CRITHI_temp103 = "83000"
-CRITLO_temp103 = "0"
-
-LABEL_temp106 = "p1_core5_temp"
-WARNHI_temp106 = "78000"
-WARNLO_temp106 = "0"
-CRITHI_temp106 = "83000"
-CRITLO_temp106 = "0"
-
-LABEL_temp109 = "p1_core6_temp"
-WARNHI_temp109 = "78000"
-WARNLO_temp109 = "0"
-CRITHI_temp109 = "83000"
-CRITLO_temp109 = "0"
-
-LABEL_temp112 = "p1_core7_temp"
-WARNHI_temp112 = "78000"
-WARNLO_temp112 = "0"
-CRITHI_temp112 = "83000"
-CRITLO_temp112 = "0"
-
-LABEL_temp115 = "p1_core8_temp"
-WARNHI_temp115 = "78000"
-WARNLO_temp115 = "0"
-CRITHI_temp115 = "83000"
-CRITLO_temp115 = "0"
-
-LABEL_temp118 = "p1_core9_temp"
-WARNHI_temp118 = "78000"
-WARNLO_temp118 = "0"
-CRITHI_temp118 = "83000"
-CRITLO_temp118 = "0"
-
-LABEL_temp121 = "p1_core10_temp"
-WARNHI_temp121 = "78000"
-WARNLO_temp121 = "0"
-CRITHI_temp121 = "83000"
-CRITLO_temp121 = "0"
-
-LABEL_temp124 = "p1_core11_temp"
-WARNHI_temp124 = "78000"
-WARNLO_temp124 = "0"
-CRITHI_temp124 = "83000"
-CRITLO_temp124 = "0"
-
-LABEL_temp127 = "p1_core12_temp"
-WARNHI_temp127 = "78000"
-WARNLO_temp127 = "0"
-CRITHI_temp127 = "83000"
-CRITLO_temp127 = "0"
-
-LABEL_temp130 = "p1_core13_temp"
-WARNHI_temp130 = "78000"
-WARNLO_temp130 = "0"
-CRITHI_temp130 = "83000"
-CRITLO_temp130 = "0"
-
-LABEL_temp133 = "p1_core14_temp"
-WARNHI_temp133 = "78000"
-WARNLO_temp133 = "0"
-CRITHI_temp133 = "83000"
-CRITLO_temp133 = "0"
-
-LABEL_temp136 = "p1_core15_temp"
-WARNHI_temp136 = "78000"
-WARNLO_temp136 = "0"
-CRITHI_temp136 = "83000"
-CRITLO_temp136 = "0"
-
-LABEL_temp139 = "p1_core16_temp"
-WARNHI_temp139 = "78000"
-WARNLO_temp139 = "0"
-CRITHI_temp139 = "83000"
-CRITLO_temp139 = "0"
-
-LABEL_temp142 = "p1_core17_temp"
-WARNHI_temp142 = "78000"
-WARNLO_temp142 = "0"
-CRITHI_temp142 = "83000"
-CRITLO_temp142 = "0"
-
-LABEL_temp145 = "p1_core18_temp"
-WARNHI_temp145 = "78000"
-WARNLO_temp145 = "0"
-CRITHI_temp145 = "83000"
-CRITLO_temp145 = "0"
-
-LABEL_temp148 = "p1_core19_temp"
-WARNHI_temp148 = "78000"
-WARNLO_temp148 = "0"
-CRITHI_temp148 = "83000"
-CRITLO_temp148 = "0"
-
-LABEL_temp151 = "p1_core20_temp"
-WARNHI_temp151 = "78000"
-WARNLO_temp151 = "0"
-CRITHI_temp151 = "83000"
-CRITLO_temp151 = "0"
-
-LABEL_temp154 = "p1_core21_temp"
-WARNHI_temp154 = "78000"
-WARNLO_temp154 = "0"
-CRITHI_temp154 = "83000"
-CRITLO_temp154 = "0"
-
-LABEL_temp157 = "p1_core22_temp"
-WARNHI_temp157 = "78000"
-WARNLO_temp157 = "0"
-CRITHI_temp157 = "83000"
-CRITLO_temp157 = "0"
-
-LABEL_temp160 = "p1_core23_temp"
-WARNHI_temp160 = "78000"
-WARNLO_temp160 = "0"
-CRITHI_temp160 = "83000"
-CRITLO_temp160 = "0"
-
-LABEL_temp181 = "dimm8_temp"
-WARNHI_temp181 = "78000"
-WARNLO_temp181 = "0"
-CRITHI_temp181 = "83000"
-CRITLO_temp181 = "0"
-
-LABEL_temp183 = "dimm9_temp"
-WARNHI_temp183 = "78000"
-WARNLO_temp183 = "0"
-CRITHI_temp183 = "83000"
-CRITLO_temp183 = "0"
-
-LABEL_temp185 = "dimm10_temp"
-WARNHI_temp185 = "78000"
-WARNLO_temp185 = "0"
-CRITHI_temp185 = "83000"
-CRITLO_temp185 = "0"
-
-LABEL_temp187 = "dimm11_temp"
-WARNHI_temp187 = "78000"
-WARNLO_temp187 = "0"
-CRITHI_temp187 = "83000"
-CRITLO_temp187 = "0"
-
-LABEL_temp189 = "dimm12_temp"
-WARNHI_temp189 = "78000"
-WARNLO_temp189 = "0"
-CRITHI_temp189 = "83000"
-CRITLO_temp189 = "0"
-
-LABEL_temp191 = "dimm13_temp"
-WARNHI_temp191 = "78000"
-WARNLO_temp191 = "0"
-CRITHI_temp191 = "83000"
-CRITLO_temp191 = "0"
-
-LABEL_temp193 = "dimm14_temp"
-WARNHI_temp193 = "78000"
-WARNLO_temp193 = "0"
-CRITHI_temp193 = "83000"
-CRITLO_temp193 = "0"
-
-LABEL_temp195 = "dimm15_temp"
-WARNHI_temp195 = "78000"
-WARNLO_temp195 = "0"
-CRITHI_temp195 = "83000"
-CRITLO_temp195 = "0"
-
-LABEL_temp207 = "gpu3_core_temp"
-WARNHI_temp207 = "76000"
-WARNLO_temp207 = "0"
-CRITHI_temp207 = "81000"
-CRITLO_temp207 = "0"
-
-LABEL_temp208 = "gpu3_mem_temp"
-WARNHI_temp208 = "78000"
-WARNLO_temp208 = "0"
-CRITHI_temp208 = "83000"
-CRITLO_temp208 = "0"
-
-LABEL_temp210 = "gpu4_core_temp"
-WARNHI_temp210 = "76000"
-WARNLO_temp210 = "0"
-CRITHI_temp210 = "81000"
-CRITLO_temp210 = "0"
-
-LABEL_temp211 = "gpu4_mem_temp"
-WARNHI_temp211 = "78000"
-WARNLO_temp211 = "0"
-CRITHI_temp211 = "83000"
-CRITLO_temp211 = "0"
-
-LABEL_temp213 = "gpu5_core_temp"
-WARNHI_temp213 = "76000"
-WARNLO_temp213 = "0"
-CRITHI_temp213 = "81000"
-CRITLO_temp213 = "0"
-
-LABEL_temp214 = "gpu5_mem_temp"
-WARNHI_temp214 = "78000"
-WARNLO_temp214 = "0"
-CRITHI_temp214 = "83000"
-CRITLO_temp214 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/start_max31785_hwmon.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/start_max31785_hwmon.sh
deleted file mode 100755
index 6d4e6ba..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/start_max31785_hwmon.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Copy in the correct MAX31785 phosphor-hwmon config file to use based on the
-# WaterCooled property, and then start the hwmon service.
-
-# $1: The OF_FULLNAME udev attribute for the MAX31785
-
-base="/etc/default/obmc/hwmon/"$1
-target=$base".conf"
-
-service=$(mapper get-service /xyz/openbmc_project/inventory/system/chassis)
-
-if [ $(busctl get-property $service \
-     /xyz/openbmc_project/inventory/system/chassis \
-     xyz.openbmc_project.Inventory.Decorator.CoolingType \
-     WaterCooled | grep true | wc -l) != 0 ];
-then
-    source=$base'_water.conf'
-else
-    source=$base'_air.conf'
-fi
-
-cp $source $target
-
-instance=$(systemd-escape $1)
-systemctl start xyz.openbmc_project.Hwmon@$instance.service
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager.bbappend
deleted file mode 100644
index dfa24d8..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_append_witherspoon := ":${THISDIR}/${PN}"
-SRC_URI_append_witherspoon = " file://TPMEnable-default-true.override.yml"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager/TPMEnable-default-true.override.yml b/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager/TPMEnable-default-true.override.yml
deleted file mode 100644
index 905ac12..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager/TPMEnable-default-true.override.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-/xyz/openbmc_project/control/host0/TPMEnable:
-    - Interface: xyz.openbmc_project.Control.TPM.Policy
-      Properties:
-          TPMEnable:
-             Default: 'true'
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend
deleted file mode 100644
index aa8149c..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-MRW_EXPRESSION_VARS = "-v PS_DERATING=${POWER_SUPPLY_DERATING_FACTOR}"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native/mrw-override-settings.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native/mrw-override-settings.yaml
deleted file mode 100644
index c823896..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native/mrw-override-settings.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-/xyz/openbmc_project/control/host0/power_cap:
-    - Interface: xyz.openbmc_project.Control.Power.Cap
-      Properties:
-          PowerCap:
-              Default: 0
-              Validation:
-                  Type: "range"
-                  Validator: "[[MRW_OPEN_POWER_SOFT_MIN_PCAP_WATTS/(PS_DERATING/100)]]..[[MRW_OPEN_POWER_N_PLUS_ONE_BULK_POWER_LIMIT_WATTS/(PS_DERATING/100)]]"
-                  Unit: "Watts"
-          PowerCapEnable:
-               Default: 'false'
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd.bbappend
deleted file mode 100644
index 6a00acf..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-do_install_append() {
-        DEST=${D}${inventory_envdir}
-        printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a400.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory
-}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/workbook/devtree-config-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/workbook/devtree-config-native.bb
deleted file mode 100644
index 9a16dd6..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/workbook/devtree-config-native.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "Witherspoon Device Tree Configuration"
-DESCRIPTION = "Provides the device tree configuration file for Witherspoon"
-PR = "r1"
-
-inherit obmc-phosphor-license
-inherit native
-
-SRC_URI += "file://config.yaml"
-
-FILES_${PN} += "${datadir}/devtree"
-
-do_install() {
-    install -d ${D}${datadir}/devtree
-    install -m 0644 config.yaml ${D}${datadir}/devtree/
-}
-
-S = "${WORKDIR}"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/workbook/devtree-config/config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/workbook/devtree-config/config.yaml
deleted file mode 100644
index 3094c16..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/workbook/devtree-config/config.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-#Device tree include files, which can be
-#included in different parts of the tree.
-#Optional.
-includes:
-  pre-root-node:
-   - aspeed-g5.dtsi
-   - dt-bindings/gpio/aspeed-gpio.h
-  root-node:
-  post-root-node:
-
-#The BMC's memory base address and size.
-#Required.
-memory:
-  base: 0x80000000
-  size: 0x40000000
-
-#Enables the mapping of the host SPI flash into memory
-#and the LPC mailbox to allow host access to that data.
-#Required for most P9 OpenPower systems.
-lpc-host-spi-flash-mailbox:
-  #The address range to map the flash into
-  bmc-address-range:
-    base: 0x94000000
-    size: 0x04000000 #64MB
-
-#Values for the chosen node.
-#Required.
-chosen:
-  stdout-path: (alias)uart5
-  bootargs: console=ttyS4,115200 earlyprintk
-
-#Values for the aliases node.
-#Optional.
-aliases:
-  serial4: uart5
-
-#The number that should be added to the MRW's
-#I2C bus number to get the device tree's number.
-#Optional.
-i2c-bus-adjust: -1
-
-#BMC flash specific fields that don't belong
-#in the MRW.  Keys and values here show up
-#as-is in the node structure that gets passed to
-#the node generator code.
-bmc-flash-config:
-  chip-select-0:
-     DTSI_INCLUDE: aspeed-bmc-opp-flash-layout.dtsi
-  chip-select-1:
-    label: alt
-
-#If OpenFSI device tree support should be enabled.
-#true or false
-enable-openfsi: true
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/workbook/witherspoon-config.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/workbook/witherspoon-config.bb
deleted file mode 100644
index e08f89d..0000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/workbook/witherspoon-config.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SUMMARY = "Witherspoon board wiring"
-DESCRIPTION = "Board wiring information for the Witherspoon OpenPOWER system."
-PR = "r1"
-
-inherit config-in-skeleton
diff --git a/meta-ibm/meta-witherspoon/recipes.txt b/meta-ibm/meta-witherspoon/recipes.txt
deleted file mode 100644
index a943f59..0000000
--- a/meta-ibm/meta-witherspoon/recipes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-recipes-core         - What's needed to build a basic working Linux image including commonly used dependencies
-recipes-kernel       - The kernel and generic applications/libraries with strong kernel dependencies
-recipes-phosphor     - Phosphor OpenBMC applications and configuration
diff --git a/meta-ibm/meta-z/conf/bblayers.conf.sample b/meta-ibm/meta-z/conf/bblayers.conf.sample
deleted file mode 100644
index 43eef92..0000000
--- a/meta-ibm/meta-z/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,25 +0,0 @@
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-LCONF_VERSION = "7"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe/   \
-  ##OEROOT##/meta-openembedded/meta-filesystems/   \
-  ##OEROOT##/meta-openembedded/meta-networking/   \
-  ##OEROOT##/meta-openembedded/meta-python/   \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-ibm/meta-fsp2 \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z \
-"
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-ibm/meta-z/conf/conf-notes.txt b/meta-ibm/meta-z/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a..0000000
--- a/meta-ibm/meta-z/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-ibm/meta-z/conf/layer.conf b/meta-ibm/meta-z/conf/layer.conf
deleted file mode 100644
index 790dc69..0000000
--- a/meta-ibm/meta-z/conf/layer.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-BBFILE_COLLECTIONS += "ibm-z"
-BBFILE_PATTERN_ibm-z = ""
diff --git a/meta-ibm/meta-z/conf/local.conf.sample b/meta-ibm/meta-z/conf/local.conf.sample
deleted file mode 100644
index 988416f..0000000
--- a/meta-ibm/meta-z/conf/local.conf.sample
+++ /dev/null
@@ -1,18 +0,0 @@
-MACHINE ??= "ibm-z"
-DISTRO ?= "openbmc-phosphor"
-PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
-    STOPTASKS,${TMPDIR},1G,100K \
-    STOPTASKS,${DL_DIR},1G,100K \
-    STOPTASKS,${SSTATE_DIR},1G,100K \
-    STOPTASKS,/tmp,100M,100K \
-    ABORT,${TMPDIR},100M,1K \
-    ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K \
-    ABORT,/tmp,10M,1K"
-CONF_VERSION = "1"
-INHERIT += "extrausers"
diff --git a/meta-ibm/meta-z/conf/machine/ibm-z.conf b/meta-ibm/meta-z/conf/machine/ibm-z.conf
deleted file mode 100644
index 90765bd..0000000
--- a/meta-ibm/meta-z/conf/machine/ibm-z.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-MACHINE = "ibm-z"
-KERNEL_DEVICETREE = "fsp2.dtb"
-KBUILD_DEFCONFIG = "44x/fsp2_defconfig"
-
-require conf/machine/include/fsp2.inc
-require conf/machine/include/obmc-bsp-common.inc
-require conf/machine/include/ibm.inc
-
-#dummy uboot settings
-UBOOT_MACHINE_sunray2 = "mpc8308_p1m_defconfig"
-UBOOT_ENTRYPOINT = "0x0"
-UBOOT_LOADADDRESS = "0x0"
-
diff --git a/meta-ibm/recipes-httpd/nginx/files/gen-cert.sh b/meta-ibm/recipes-httpd/nginx/files/gen-cert.sh
deleted file mode 100644
index 480266f..0000000
--- a/meta-ibm/recipes-httpd/nginx/files/gen-cert.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-PEM="/etc/ssl/certs/nginx/cert.pem"
-
-if [ ! -f $PEM ]; then
-    openssl req -x509 -sha256 -newkey rsa:2048 -keyout $PEM -out $PEM \
-    -days 3650 -subj "/O=openbmc-project.xyz/CN=localhost" \
-    -nodes
-fi
diff --git a/meta-ibm/recipes-httpd/nginx/files/nginx.conf b/meta-ibm/recipes-httpd/nginx/files/nginx.conf
deleted file mode 100644
index 7d65183..0000000
--- a/meta-ibm/recipes-httpd/nginx/files/nginx.conf
+++ /dev/null
@@ -1,114 +0,0 @@
-
-user www-data;
-worker_processes  1;
-
-error_log  stderr;
-
-pid        /run/nginx/nginx.pid;
-
-
-# Nginx requires this section, even if no options
-events {
-}
-
-# Note that a lot of these settings come from the OWASP Secure
-# Configuration guide for nginx
-# https://www.owasp.org/index.php/SCG_WS_nginx
-# and the mozilla security guidelines
-# https://wiki.mozilla.org/Security/Server_Side_TLS
-
-http {
-    include       mime.types;
-
-    # For certain locations, only allow one connection per IP
-    limit_conn_zone $binary_remote_addr zone=addr:10m;
-
-    # Default log format
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    # Comment out to enable access log in /var/log/nginx/
-    access_log  off;
-
-    client_body_timeout   30;
-    client_header_timeout 10;
-    keepalive_timeout     5 5;
-    send_timeout          30;
-
-    # Do not return nginx version to clients
-    server_tokens  off;
-
-    client_max_body_size 100k;
-    client_body_buffer_size  100K;
-    client_header_buffer_size 1k;
-    large_client_header_buffers 4 8k;
-
-    # redirect all http traffic to https
-    server {
-        listen 80 default_server;
-        listen [::]:80 default_server;
-        server_name _;
-        return 301 https://$host$request_uri;
-    }
-
-    server {
-        listen       443 ssl;
-        server_name  127.0.0.1;
-
-        ssl                  on;
-        ssl_certificate      @CERTPATH@/cert.pem;
-        ssl_certificate_key  @CERTPATH@/cert.pem;
-        ssl_session_timeout  5m;
-        ssl_protocols  TLSv1.2;
-        ssl_ciphers "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256";
-        ssl_prefer_server_ciphers   on;
-
-        location / {
-                # This location lets us serve the static pre-compressed webui
-                # content (rooted at /usr/share/www). Also if the URI points to
-                # something else (that is unmatched by other locations), we
-                # fallback to the rest server. This approach is based on the
-                # guide at https://docs.nginx.com/nginx/admin-guide/web-server/serving-static-content.
-                root /usr/share/www;
-                # For clients that support gzip encoding, serve them
-                # pre-compressed gzip content. For clients that don't,
-                # uncompress on the BMC. The module gunzip requires
-                # gzip_static to be set to 'always'; gzip_static is the
-                # module that serves compressed content for clients that
-                # support gzip.
-                gunzip on;
-                gzip_static always;
-                try_files $uri $uri/ @rest_server;
-        }
-        location @rest_server {
-                # Use 127.0.0.1 instead of localhost since nginx will
-                # first use ipv6 address of ::1 which the upstream server
-                # is not listening on. This generates an error msg to
-                # the journal. Nginx then uses the 127.0.0.1 and everything
-                # works fine but want to avoid the error msg to the log.
-                proxy_pass http://127.0.0.1:8081;
-
-                # WebSocket support
-                proxy_http_version 1.1;
-                proxy_set_header Upgrade $http_upgrade;
-                proxy_set_header Connection "upgrade";
-        }
-        location ~ (/org/openbmc/control/flash/bmc/action/update|/upload/image|/download/dump) {
-                 # Marked as 33MB to allow for firmware image updating and dump
-                 # downloads
-                 client_max_body_size 33M;
-
-                 # Only 1 connection at a time here from an IP
-                 limit_conn addr 1;
-
-                 proxy_pass http://127.0.0.1:8081;
-        }
-        location /redfish {
-                proxy_pass http://127.0.0.1:8082;
-                proxy_http_version 1.1;
-        }
-
-        include /etc/nginx/sites-enabled/443_*.conf;
-    }
-}
diff --git a/meta-ibm/recipes-httpd/nginx/files/nginx.service b/meta-ibm/recipes-httpd/nginx/files/nginx.service
deleted file mode 100644
index 3f9dd3d..0000000
--- a/meta-ibm/recipes-httpd/nginx/files/nginx.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=The NGINX HTTP and reverse proxy server
-After=network.target
-
-[Service]
-Type=forking
-SyslogIdentifier=nginx
-ExecStartPre=/usr/bin/env gen-cert.sh
-ExecStartPre=-/usr/bin/env mkdir /var/volatile/nginx/
-ExecStartPre=/usr/bin/env nginx -t -p /var/volatile/nginx
-ExecStart=/usr/bin/env nginx -p /var/volatile/nginx
-ExecReload=/usr/bin/env kill -s HUP $MAINPID
-ExecStop=/usr/bin/env kill -s QUIT $MAINPID
-PrivateTmp=true
-# First time on system takes longer for initial setup so
-# give double normal timeout
-TimeoutStartSec=180
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-ibm/recipes-httpd/nginx/files/nginx.socket b/meta-ibm/recipes-httpd/nginx/files/nginx.socket
deleted file mode 100644
index 24be604..0000000
--- a/meta-ibm/recipes-httpd/nginx/files/nginx.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Nginx
-
-[Socket]
-ListenStream=8081
-
-[Install]
-WantedBy=sockets.target
diff --git a/meta-ibm/recipes-httpd/nginx/nginx_%.bbappend b/meta-ibm/recipes-httpd/nginx/nginx_%.bbappend
deleted file mode 100644
index 8eb7e40..0000000
--- a/meta-ibm/recipes-httpd/nginx/nginx_%.bbappend
+++ /dev/null
@@ -1,33 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit systemd
-inherit obmc-phosphor-systemd
-
-SRC_URI += " \
-    file://nginx.conf \
-    file://nginx.service \
-    file://gen-cert.sh \
-    "
-
-EXTRA_OECONF =+ " --without-select_module --with-http_gunzip_module"
-
-SSLCERTPATH = "/etc/ssl/certs/nginx/"
-
-
-do_install_append() {
-
-    install -m 644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx
-    install -m 0755 ${WORKDIR}/gen-cert.sh ${D}${sbindir}/gen-cert.sh
-
-    install -d ${D}${SSLCERTPATH}
-    chown -R www:www-data      ${D}${SSLCERTPATH}
-
-
-    echo SSLCERTPATH
-    echo ${SSLCERTPATH}
-    sed -i 's,@CERTPATH@,${SSLCERTPATH},g' ${D}${sysconfdir}/nginx/nginx.conf
-}
-
-FILES_${PN} += " ${SSLCERTPATH} "
-
-SYSTEMD_SERVICE_${PN} += " nginx.service"
diff --git a/meta-ibm/recipes-phosphor/bmcweb/bmcweb.bbappend b/meta-ibm/recipes-phosphor/bmcweb/bmcweb.bbappend
deleted file mode 100644
index e3f627f..0000000
--- a/meta-ibm/recipes-phosphor/bmcweb/bmcweb.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-SUMMARY = "Modifications to support Nginx"
-
-# Behind NGINX so disable SSL in bmcweb
-EXTRA_OECMAKE += "-DBMCWEB_INSECURE_DISABLE_SSL=ON"
-
-# Only need redfish support
-EXTRA_OECMAKE += "-DBMCWEB_ENABLE_KVM=OFF -DBMCWEB_ENABLE_DBUS_REST=OFF"
-
-# override service and socket file to use nginx
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.service b/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.service
deleted file mode 100644
index 832eb04..0000000
--- a/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=BMC Redfish Server (bmcweb)
-After=network.target
-After=obmc-webserver-pre.target
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env bmcweb
-SyslogIdentifier=bmcweb
diff --git a/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.socket b/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.socket
deleted file mode 100644
index 40e6897..0000000
--- a/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Phosphor redfish socket (bmcweb)
-
-[Socket]
-ListenStream=127.0.0.1:8082
-
-[Install]
-WantedBy=sockets.target
diff --git a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb
deleted file mode 100644
index 8347b9e..0000000
--- a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SUMMARY="Add /com/ibm namespace to phosphor-mapper"
-DESCRIPTION="Add the /com/ibm path namespace and \
-com.ibm interface prefix to the mapper watch list."
-
-inherit phosphor-mapper
-inherit native
-inherit obmc-phosphor-license
-
-PHOSPHOR_MAPPER_NAMESPACE_append = " /com/ibm"
-PHOSPHOR_MAPPER_INTERFACE_append = " com.ibm"
diff --git a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces.bb b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces.bb
deleted file mode 100644
index 947f5d7..0000000
--- a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "IBM DBus Interfaces"
-DESCRIPTION = "Generated bindings, using sdbus++, for the IBM YAML"
-PR = "r1"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-inherit obmc-phosphor-license
-inherit pythonnative
-inherit phosphor-dbus-yaml
-
-DEPENDS += "autoconf-archive-native"
-DEPENDS += "sdbus++-native"
-
-SRC_URI += "git://github.com/openbmc/ibm-dbus-interfaces"
-SRCREV = "62c7bff037587fe0fbfdffbe622058d86c7d7b7b"
-
-DEPENDS_remove_class-native = "sdbus++-native"
-DEPENDS_remove_class-nativesdk = "sdbus++-native"
-
-PACKAGECONFIG ??= "libibm_dbus"
-PACKAGECONFIG[libibm_dbus] = " \
-        --enable-libibm_dbus, \
-        --disable-libibm_dbus, \
-        systemd sdbusplus, \
-        libsystemd sdbusplus \
-        "
-
-PACKAGECONFIG_remove_class-native = "libibm_dbus"
-PACKAGECONFIG_remove_class-nativesdk = "libibm_dbus"
-
-BBCLASSEXTEND += "native nativesdk"
diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
deleted file mode 100644
index d94a554..0000000
--- a/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PHOSPHOR_MAPPER_CONFIGS_append = " ibm-dbus-interfaces-mapper-config-native"
diff --git a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector.bbappend b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector.bbappend
deleted file mode 100644
index 402e4fa..0000000
--- a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://plugins.d/ibm_elogall"
-
-install_ibm_plugins() {
-
-    install -m 0755 ${WORKDIR}/plugins.d/ibm_elogall ${D}${dreport_plugin_dir}
-
-}
-
-#Link in the plugins so dreport run them at the appropriate time
-python link_ibm_plugins() {
-
-    workdir = d.getVar('WORKDIR', True)
-    script = os.path.join(workdir, 'plugins.d', 'ibm_elogall')
-    install_dreport_user_script(script, d)
-
-}
-
-do_install[postfuncs] += "install_ibm_plugins"
-do_install[postfuncs] += "link_ibm_plugins"
diff --git a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/ibm_elogall b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/ibm_elogall
deleted file mode 100644
index 3054f23..0000000
--- a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/ibm_elogall
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# config: 2 20
-# @brief: Get the IBM specific elog objects
-#
-
-. $DREPORT_INCLUDE/functions
-
-desc="IBM elog"
-
-entries=$(busctl --list --no-pager tree \
-                 com.ibm.Logging | grep \
-                 '/xyz/openbmc_project/logging/entry/')
-
-#check for elog entries.
-if [ -z "$entries" ]; then
-    log_info "No $desc entries"
-    exit 0
-fi
-
-command="busctl call --verbose --no-pager \
-                com.ibm.Logging \
-                /xyz/openbmc_project/logging \
-                org.freedesktop.DBus.ObjectManager \
-                GetManagedObjects"
-
-file_name="ibm_elogall.log"
-
-add_cmd_output "$command" "$file_name" "$desc"
diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging.bb
deleted file mode 100644
index e326787..0000000
--- a/meta-ibm/recipes-phosphor/logging/ibm-logging.bb
+++ /dev/null
@@ -1,79 +0,0 @@
-SUMMARY = "IBM enhanced error logging"
-DESCRIPTION = "Adds additional error logging functionality for IBM systems"
-PR = "r1"
-HOMEPAGE = "https://github.com/openbmc/ibm-logging"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-SRC_URI += "git://github.com/openbmc/ibm-logging"
-SRCREV = "34af47ff623ce077670d270693f36e4c51adfa10"
-
-inherit autotools
-inherit pkgconfig
-inherit pythonnative
-inherit obmc-phosphor-dbus-service
-inherit obmc-phosphor-systemd
-inherit phosphor-dbus-yaml
-
-DEPENDS += " \
-         ibm-dbus-interfaces \
-         phosphor-logging \
-         nlohmann-json \
-         autoconf-archive-native \
-         sdbusplus \
-         "
-
-RDEPENDS_${PN} += " \
-         phosphor-logging \
-         phosphor-dbus-interfaces \
-         sdbusplus \
-         "
-
-S = "${WORKDIR}/git"
-
-SRC_URI += "file://policyTable.json"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[policy-interface] = "--enable-policy-interface, --disable-policy-interface,,"
-
-SERVICE = "com.ibm.Logging.service"
-DBUS_SERVICE_${PN} += "${SERVICE}"
-
-#The link is so that this service will restart if phosphor-logging restarts.
-#The BindsTo in the service will not do the restart, it will only do the
-#original start and a stop.
-LOG_FMT = "../${SERVICE}:xyz.openbmc_project.Logging.service.wants/${SERVICE}"
-SYSTEMD_LINK_${PN} += "${LOG_FMT}"
-
-do_install_append(){
-
-    install -d ${D}${datadir}/ibm-logging
-
-    ${S}/condense_policy.py \
-        -p ${WORKDIR}/policyTable.json \
-        -c ${D}/${datadir}/ibm-logging/policy.json
-}
-
-#An optional task to generate a report on all of the errors
-#created by OpenBMC, and compare these errors to what is
-#in the error policy table
-do_report(){
-
-    ${S}/create_error_reports.py \
-        -p ${D}/${datadir}/ibm-logging/policy.json \
-        -y ${STAGING_DIR_NATIVE}${yaml_dir} \
-        -e ${WORKDIR}/build/all_errors.json \
-        -x ${WORKDIR}/build/policy_crosscheck.txt
-
-}
-
-addtask report
-
-#Collect all of the error YAML files into our recipe-sysroot-native dir.
-do_report[depends] = " \
-                     ibm-logging:do_install \
-                     phosphor-logging-error-logs-native:do_populate_sysroot \
-                     phosphor-dbus-interfaces-native:do_populate_sysroot \
-                     openpower-dbus-interfaces-native:do_populate_sysroot \
-                     openpower-occ-control-native:do_populate_sysroot  \
-                     openpower-debug-collector-native:do_populate_sysroot \
-                     "
diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging/com.ibm.Logging.service b/meta-ibm/recipes-phosphor/logging/ibm-logging/com.ibm.Logging.service
deleted file mode 100644
index 57ebc99..0000000
--- a/meta-ibm/recipes-phosphor/logging/ibm-logging/com.ibm.Logging.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=IBM Log Manager
-After=xyz.openbmc_project.Logging.service
-BindsTo=xyz.openbmc_project.Logging.service
-
-[Service]
-ExecStart=/usr/bin/env ibm-log-manager
-SyslogIdentifier=ibm-log-manager
-Restart=always
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy=xyz.openbmc_project.Logging.service
diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging/policyTable.json b/meta-ibm/recipes-phosphor/logging/ibm-logging/policyTable.json
deleted file mode 100644
index 677c024..0000000
--- a/meta-ibm/recipes-phosphor/logging/ibm-logging/policyTable.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "_comment": "This file should be overridden with one from the machine layer.",
-    "events": {
-    }
-}
diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
deleted file mode 100644
index 0b0a9c9..0000000
--- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-RDEPENDS_${PN}-logging += "ibm-logging"
-RDEPENDS_${PN}-extras += "nginx bmcweb"
diff --git a/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent.bbappend b/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent.bbappend
deleted file mode 100644
index 6dd263b..0000000
--- a/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-SUMMARY = "Modifications to support Nginx"
-
-# override service and socket file to use nginx
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.service b/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.service
deleted file mode 100644
index 6b4e77f..0000000
--- a/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Phosphor REST Server
-After=network.target
-After=obmc-webserver-pre.target
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env phosphor-gevent $APPLICATION --no-ssl
-SyslogIdentifier=phosphor-gevent
-Environment="PYTHONUNBUFFERED=1"
-EnvironmentFile={envfiledir}/obmc/wsgi_app
diff --git a/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.socket b/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.socket
deleted file mode 100644
index f7fde31..0000000
--- a/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Phosphor Webserver socket
-
-[Socket]
-ListenStream=127.0.0.1:8081
-
-[Install]
-WantedBy=sockets.target
diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf
deleted file mode 100644
index fb3404f..0000000
--- a/meta-ingrasys/conf/layer.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-BBFILE_COLLECTIONS += "ingrasys"
-BBFILE_PATTERN_ingrasys = ""
-LAYERSERIES_COMPAT_ingrasys = "sumo"
diff --git a/meta-ingrasys/conf/machine/include/ingrasys.inc b/meta-ingrasys/conf/machine/include/ingrasys.inc
deleted file mode 100644
index c79ddd7..0000000
--- a/meta-ingrasys/conf/machine/include/ingrasys.inc
+++ /dev/null
@@ -1 +0,0 @@
-require conf/machine/include/openpower.inc
diff --git a/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
deleted file mode 100644
index 80b95b5..0000000
--- a/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,35 +0,0 @@
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-LCONF_VERSION = "7"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius \
-  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius \
-  "
diff --git a/meta-ingrasys/meta-zaius/conf/conf-notes.txt b/meta-ingrasys/meta-zaius/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a..0000000
--- a/meta-ingrasys/meta-zaius/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf
deleted file mode 100644
index 7467aa5..0000000
--- a/meta-ingrasys/meta-zaius/conf/layer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-            ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "zaius"
-BBFILE_PATTERN_zaius = ""
-LAYERSERIES_COMPAT_zaius = "sumo"
diff --git a/meta-ingrasys/meta-zaius/conf/local.conf.sample b/meta-ingrasys/meta-zaius/conf/local.conf.sample
deleted file mode 100644
index f137436..0000000
--- a/meta-ingrasys/meta-zaius/conf/local.conf.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-MACHINE ??= "zaius"
-DISTRO ?= "openbmc-openpower"
-PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
-    STOPTASKS,${TMPDIR},1G,100K \
-    STOPTASKS,${DL_DIR},1G,100K \
-    STOPTASKS,${SSTATE_DIR},1G,100K \
-    STOPTASKS,/tmp,100M,100K \
-    ABORT,${TMPDIR},100M,1K \
-    ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K \
-    ABORT,/tmp,10M,1K"
-CONF_VERSION = "1"
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
-  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
-  "
diff --git a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf
deleted file mode 100644
index 9b1050a..0000000
--- a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
-
-UBOOT_MACHINE = "ast_g5_ncsi_config"
-
-FLASH_SIZE = "65536"
-
-PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'vcs-control'
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "zaius-ipmi-inventory-map-native"
-
-require conf/machine/include/ast2500.inc
-require conf/machine/include/obmc-bsp-common.inc
-require conf/machine/include/ingrasys.inc
-require conf/machine/include/p9.inc
diff --git a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-reset_phy-for-Zaius.patch b/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-reset_phy-for-Zaius.patch
deleted file mode 100644
index 3b621e3..0000000
--- a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-reset_phy-for-Zaius.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 3cd9aa92ab8ddd230cf6a9a68a27a18705b6f57c Mon Sep 17 00:00:00 2001
-From: Xo Wang <xow@google.com>
-Date: Thu, 20 Oct 2016 16:26:29 -0700
-Subject: [PATCH 1/2] board/aspeed: Add reset_phy() for Zaius
-
-The Broadcom PHY for the Zaius BMC requires a hard reset after RGMII
-clocks are enabled. Add reset_phy() implementation and configure it to
-be called.
-
-Signed-off-by: Xo Wang <xow@google.com>
----
- board/aspeed/ast-g5/ast-g5.c | 19 +++++++++++++++++++
- include/configs/ast-common.h |  3 +++
- 2 files changed, 22 insertions(+)
-
-diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c
-index da79d7b..433ad18 100644
---- a/board/aspeed/ast-g5/ast-g5.c
-+++ b/board/aspeed/ast-g5/ast-g5.c
-@@ -33,6 +33,25 @@ int dram_init(void)
- 	return 0;
- }
- 
-+void reset_phy(void)
-+{
-+	unsigned long reg;
-+	/* D3 in GPIOA/B/C/D direction and data registers */
-+	unsigned long phy_reset_mask = BIT(27);
-+
-+	/* Assert MAC2 PHY hardware reset */
-+	/* Set pin low */
-+	reg = readl(AST_GPIO_BASE | 0x00);
-+	writel(reg & ~phy_reset_mask, AST_GPIO_BASE | 0x00);
-+	/* Enable pin for output */
-+	reg = readl(AST_GPIO_BASE | 0x04);
-+	writel(reg | phy_reset_mask, AST_GPIO_BASE | 0x04);
-+	udelay(3);
-+	/* Set pin high */
-+	reg = readl(AST_GPIO_BASE | 0x00);
-+	writel(reg | phy_reset_mask, AST_GPIO_BASE | 0x00);
-+}
-+
- #ifdef CONFIG_FTGMAC100
- int board_eth_init(bd_t *bd)
- {
-diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h
-index b39ea33..3566f73 100644
---- a/include/configs/ast-common.h
-+++ b/include/configs/ast-common.h
-@@ -104,4 +104,7 @@
- 	"spi_dma=yes\0" \
- 	""
- 
-+/* Call reset_phy() */
-+#define CONFIG_RESET_PHY_R	1
-+
- #endif	/* __AST_COMMON_CONFIG_H */
--- 
-2.8.0.rc3.226.g39d4020
-
diff --git a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch b/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch
deleted file mode 100644
index 2de2d82..0000000
--- a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cbb09e400a5283e5b543e2b01b8c0038890a5260 Mon Sep 17 00:00:00 2001
-From: Xo Wang <xow@google.com>
-Date: Thu, 20 Oct 2016 17:42:13 -0700
-Subject: [PATCH 2/2] board/aspeed, aspeednic: Use MAC2 for networking
-
-Enable and select MAC2 for aspeednic.
-
-Signed-off-by: Xo Wang <xow@google.com>
----
- drivers/net/aspeednic.c       | 4 ++--
- include/configs/ast-g5-ncsi.h | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/aspeednic.c b/drivers/net/aspeednic.c
-index 8b85893..cff8370 100644
---- a/drivers/net/aspeednic.c
-+++ b/drivers/net/aspeednic.c
-@@ -18,8 +18,8 @@
- /* From the board config file */
- #define CONFIG_MAC1_PHY_SETTING         2
- #define CONFIG_MAC2_PHY_SETTING         0
--#define CONFIG_ASPEED_MAC_NUMBER  1
--#define CONFIG_ASPEED_MAC_CONFIG  1 // config MAC1
-+#define CONFIG_ASPEED_MAC_NUMBER  2
-+#define CONFIG_ASPEED_MAC_CONFIG  2 // config MAC2
- #define _PHY_SETTING_CONCAT(mac) CONFIG_MAC##mac##_PHY_SETTING
- #define _GET_MAC_PHY_SETTING(mac) _PHY_SETTING_CONCAT(mac)
- #define CONFIG_ASPEED_MAC_PHY_SETTING \
-diff --git a/include/configs/ast-g5-ncsi.h b/include/configs/ast-g5-ncsi.h
-index f73a8f1..1408618 100644
---- a/include/configs/ast-g5-ncsi.h
-+++ b/include/configs/ast-g5-ncsi.h
-@@ -22,6 +22,7 @@
- /* Ethernet */
- #define CONFIG_LIB_RAND
- #define CONFIG_ASPEEDNIC
-+#define CONFIG_MAC2_ENABLE
- 
- /* platform.S settings */
- #define	CONFIG_DRAM_ECC_SIZE		0x10000000
--- 
-2.8.0.rc3.226.g39d4020
-
diff --git a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
deleted file mode 100644
index 1686be0..0000000
--- a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:"
-SRC_URI_append_zaius = " file://0001-board-aspeed-Add-reset_phy-for-Zaius.patch \
-                         file://0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch"
diff --git a/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed/zaius.cfg b/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed/zaius.cfg
deleted file mode 100644
index 75c630c..0000000
--- a/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed/zaius.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG_I2C_MUX=y
-CONFIG_I2C_MUX_PCA9541=y
-CONFIG_I2C_MUX_PCA954x=y
-CONFIG_W1=y
-CONFIG_W1_MASTER_GPIO=y
-CONFIG_W1_SLAVE_THERM=y
-CONFIG_SENSORS_LM25066=y
-CONFIG_RTC_DRV_PCF8523=y
diff --git a/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed_%.bbappend
deleted file mode 100644
index f3a8399..0000000
--- a/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:"
-SRC_URI_append_zaius = " file://zaius.cfg"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb
deleted file mode 100644
index 29f36a4..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Zaius AVSBus control"
-DESCRIPTION = "Voltage regulator module (VRM) AVSBus control for Zaius"
-PR = "r0"
-
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
-
-TMPL_OFF = "avsbus-disable@.service"
-TMPL_ON = "avsbus-enable@.service"
-INSTFMT_OFF = "avsbus-disable@{0}.service"
-INSTFMT_ON = "avsbus-enable@{0}.service"
-TGTFMT_OFF = "obmc-host-stop@{0}.target"
-TGTFMT_ON = "obmc-chassis-poweron@{0}.target"
-FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}"
-FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "${TMPL_ON}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}"
-
-SRC_URI += "file://zaius_avsbus.sh"
-RDEPENDS_${PN} += "i2c-tools"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/zaius_avsbus.sh ${D}${bindir}/zaius_avsbus.sh
-}
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
deleted file mode 100644
index 9cf322b..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Disable AVSBus on VRMs
-Wants=obmc-power-stop-pre@%i.target
-Before=obmc-power-stop-pre@%i.target
-Conflicts=obmc-host-startmin@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env zaius_avsbus.sh disable
-SyslogIdentifier=zaius_avsbus.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-host-stop@%i.target
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
deleted file mode 100644
index 24aadf5..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Enable AVSBus on VRMs
-Wants=obmc-host-start-pre@%i.target
-Before=obmc-host-start-pre@%i.target
-Conflicts=obmc-host-stop@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env zaius_avsbus.sh vdn_max
-ExecStart=/usr/bin/env zaius_avsbus.sh enable
-SyslogIdentifier=zaius_avsbus.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-RequiredBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh
deleted file mode 100755
index 45e6066..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh -e
-# AVSBus control for PMBUS voltage regulator modules (VRMs)
-# Switches output voltage target between
-# - VOUT_COMMAND register (AVSBus disabled, default on Zaius)
-# - AVSBus target output (AVSBus enabled, voltage set by host)
-
-cpu0_i2c_bus="7"
-cpu1_i2c_bus="8"
-buses="$cpu0_i2c_bus $cpu1_i2c_bus"
-vdd_i2c_addr_page="0x60:0x01"
-vdn_i2c_addr_page="0x64:0x01"
-vcs_i2c_addr_page="0x64:0x00"
-addrs_pages="$vdd_i2c_addr_page $vdn_i2c_addr_page $vcs_i2c_addr_page"
-
-# Usage: vrm_set_page <bus> <i2c_address> <page>
-vrm_set_page()
-{
-    i2cset -y $1 $2 0x00 $3 b
-}
-
-# Usage: vrm_avs_enable <bus> <i2c_address> <page>
-# Initializes the AVSBus VOUT setpoint to the value in PMBus VOUT_COMMAND
-# Sets OPERATION PMBUS register to
-# - Enable/Disable: On
-# - VOUT Source: AVSBus Target Rail Voltage
-# - AVSBus Copy: VOUT_COMMAND remains unchanged
-# Writes to VOUT setpoint over AVSBus will persist after the VRM is switched to
-# PMBus control. Switching back to AVSBus control restores this persisted
-# setpoint rather than re-initializing to PMBus VOUT_COMMAND. This behavior is
-# known to Intersil and writing VOUT_COMMAND over PMBus is the only workaround.
-vrm_avs_enable()
-{
-    vrm_set_page "$@"
-    echo Enabling AVSBus on bus $1 VRM @$2 rail $3...
-    local vout_command=`i2cget -y $1 $2 0x21 w`
-    i2cset -y $1 $2 0x21 $vout_command w
-    i2cset -y $1 $2 0x01 0xb0 b
-}
-
-# Usage: vrm_avs_disable <bus> <i2c_address> <page>
-# Sets OPERATION PMBUS register to
-# - Enable/Disable: On
-# - VOUT Source: VOUT_COMMAND
-# - AVSBus Copy: VOUT_COMMAND remains unchanged
-vrm_avs_disable()
-{
-    vrm_set_page "$@"
-    echo Disabling AVSBus on bus $1 VRM @$2 rail $3...
-    i2cset -y $1 $2 0x01 0x80 b
-}
-
-# Usage: vrm_vout_max_1v1 <bus> <i2c_address> <page>
-# Sets VOUT_MAX to 1.1V
-vrm_vout_max_1v1()
-{
-    vrm_set_page "$@"
-    echo Setting VOUT_MAX=[1.1V] on bus $1 VRM @$2 rail $3...
-    i2cset -y $1 $2 0x24 0x44c w
-}
-
-# Usage: vrm_print <bus> <i2c_address> <page>
-vrm_print()
-{
-    vrm_set_page "$@"
-    local operation=`i2cget -y $1 $2 0x01 b`
-    local vout=`i2cget -y $1 $2 0x8b w`
-    local iout=`i2cget -y $1 $2 0x8c w`
-    echo VRM on bus $1 @$2 rail $3: OPERATION=$operation VOUT=$vout IOUT=$iout
-}
-
-# Usage: for_each_rail <command>
-# <command> will be invoked with <bus> <i2c_address> <page>
-for_each_rail()
-{
-    for bus in $buses
-    do
-        for addr_page in $addrs_pages
-        do
-            $1 $bus `echo $addr_page | tr : " "`
-        done
-    done
-}
-
-if [ "$1" == "enable" ]
-then
-    for_each_rail vrm_avs_enable
-elif [ "$1" == "disable" ]
-then
-    for_each_rail vrm_avs_disable
-elif [ "$1" == "vdn_max" ]
-then
-    addrs_pages="$vdn_i2c_addr_page"
-    for_each_rail vrm_vout_max_1v1
-else
-    for_each_rail vrm_print
-    echo "\"$0 <enable|disable>\" to control whether VRMs use AVSBus"
-    echo "\"$0 <vdn_max>\" to set VDN rails VOUT_MAX to 1.1V"
-fi
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb
deleted file mode 100644
index bd33c63..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Zaius host reference clock fixup"
-PR = "r0"
-
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
-
-TMPL = "op-refclock-fixup@.service"
-INSTFMT = "op-refclock-fixup@{0}.service"
-TGTFMT = "obmc-chassis-poweron@{0}.target"
-FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}"
-
-SRC_URI += "file://fix_zaius_refclock.sh"
-RDEPENDS_${PN} += "i2c-tools"
-
-do_install() {
-        install -d ${D}${sbindir}
-        install -m 0755 ${WORKDIR}/fix_zaius_refclock.sh ${D}${sbindir}/fix_zaius_refclock.sh
-}
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/fix_zaius_refclock.sh b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/fix_zaius_refclock.sh
deleted file mode 100755
index 01eb72b..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/fix_zaius_refclock.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-# fix up refclock by reconfiguring output of Si5338C clock generator
-
-i2cset="i2cset"
-clkgen_i2c_bus="0"
-clkgen_i2c_addr="0x70"
-
-# Usage: clkgen_write <address> <data> [write length]
-clkgen_write()
-{
-    $i2cset -y $clkgen_i2c_bus $clkgen_i2c_addr $1 $2 $3
-}
-
-# disable outputs
-clkgen_write 230 0x10 b
-
-# set output configurations of each of the four channels to 3.3V HCSL
-clkgen_write 36 0x07 b
-clkgen_write 37 0x07 b
-clkgen_write 38 0x07 b
-clkgen_write 39 0x07 b
-clkgen_write 40 0xe7 b
-clkgen_write 41 0x9c b
-clkgen_write 42 0x27 b
-
-# enable outputs
-clkgen_write 230 0x00 b
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service
deleted file mode 100644
index 9444b36..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Fix up Zaius host refclock
-Wants=obmc-host-start-pre@%i.target
-Before=obmc-host-start-pre@%i.target
-Wants=obmc-power-on@%i.target
-After=obmc-power-on@%i.target
-Before=fsi-scan@%i.service
-Conflicts=obmc-host-stop@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-Restart=no
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/env fix_zaius_refclock.sh
-SyslogIdentifier=fix_zaius_refclock.sh
-
-[Install]
-RequiredBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
deleted file mode 100644
index 98fb89b..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "Zaius VCS rail control"
-DESCRIPTION = "VCS voltage rail control implementation for Zaius"
-PR = "r0"
-
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
-
-PROVIDES += 'virtual/p9-vcs-workaround'
-RPROVIDES_${PN} += 'virtual-p9-vcs-workaround'
-
-TMPL_OFF = "vcs-off@.service"
-TMPL_ON = "vcs-on@.service"
-INSTFMT_OFF = "vcs-off@{0}.service"
-INSTFMT_ON = "vcs-on@{0}.service"
-TGTFMT_OFF = "obmc-host-stop@{0}.target"
-TGTFMT_ON = "obmc-chassis-poweron@{0}.target"
-FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}"
-FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "${TMPL_ON}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}"
-
-SRC_URI += "file://zaius_vcs.sh"
-RDEPENDS_${PN} += "i2c-tools"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/zaius_vcs.sh ${D}${bindir}/zaius_vcs.sh
-}
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service
deleted file mode 100644
index d230781..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Turn VCS rails off
-Wants=obmc-power-stop-pre@%i.target
-Before=obmc-power-stop-pre@%i.target
-Conflicts=obmc-host-startmin@%i.target
-
-[Service]
-ExecStart=/usr/bin/env zaius_vcs.sh off
-SyslogIdentifier=zaius_vcs.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-host-stop@%i.target
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service
deleted file mode 100644
index 17c7cf6..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Turn VCS rails on
-Wants=vcs_workaround@%i.service
-After=vcs_workaround@%i.service
-Wants=obmc-host-start-pre@%i.target
-Before=obmc-host-start-pre@%i.target
-Conflicts=obmc-host-stop@%i.target
-
-[Service]
-ExecStart=/usr/bin/env zaius_vcs.sh on
-SyslogIdentifier=zaius_vcs.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-RequiredBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/zaius_vcs.sh b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/zaius_vcs.sh
deleted file mode 100755
index 49bf0b0..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/zaius_vcs.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh -e
-# Read and control VCS rails by sending the UCD power sequencer I2C commands.
-# This script assumes that the UCD is controlling VCS rails as GPIOs 5 and 6.
-# Also assumes that those GPIOs are already enabled.
-
-ucd_bus="0"
-ucd_addr="0x64"
-ucd_path="/sys/bus/i2c/drivers/ucd9000"
-ucd_driver="${ucd_bus}-00${ucd_addr#0x}"
-ucd_retries="5"
-
-retry()
-{
-    local i=0
-    until [ $i -ge $ucd_retries ]; do
-        i=$((i+1))
-        retry_output=`$@` && break
-    done
-    local ret=$?
-    if [ $i -eq $ucd_retries ]; then exit $ret; fi
-}
-
-# Usage: ucd_get address
-# Result stored in $ucd_reg
-ucd_get()
-{
-    retry i2cget -f -y $ucd_bus $ucd_addr $1 b
-    ucd_reg=$retry_output
-}
-
-# Usage: ucd_get address value
-ucd_set()
-{
-    retry i2cset -f -y $ucd_bus $ucd_addr $1 $2 b
-}
-
-vcs_set_gpios()
-{
-    echo -e "\tSetting UCD GPIO 5 to $1"
-    ucd_set 0xFA 5
-    ucd_set 0xFB $1
-    ucd_set 0xFB $1
-    echo -e "\tSetting UCD GPIO 6 to $1"
-    ucd_set 0xFA 6
-    ucd_set 0xFB $1
-    ucd_set 0xFB $1
-}
-
-vcs_get()
-{
-    echo Reading VCS settings
-    ucd_set 0xFA 5
-    ucd_get 0xFB
-    local val=`echo $ucd_reg | grep -i -c 0x0f`
-    echo -e "\tUCD GPIO 5 state=$val"
-    ucd_set 0xFA 6
-    ucd_get 0xFB
-    local val=`echo $ucd_reg | grep -i -c 0x0f`
-    echo -e "\tUCD GPIO 6 state=$val"
-}
-
-
-if [ "$1" == "on" ]; then
-    echo Turning on VCS
-    vcs_set_gpios 0x7
-elif [ "$1" == "off" ]; then
-    echo Turning off VCS
-    vcs_set_gpios 0x3
-else
-    vcs_get
-    echo "$0 <on|off>" to set state
-fi
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console/obmc-console.conf
deleted file mode 100644
index a5ba3f3..0000000
--- a/meta-ingrasys/meta-zaius/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-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console_%.bbappend
deleted file mode 100644
index 2072afd..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor.bbappend
deleted file mode 100644
index 801b346..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-FILESEXTRAPATHS_append_zaius := "${THISDIR}/${PN}:"
-
-PCIE_CARD_E2B_INSTANCE = "pcie-card-e2b"
-
-TMPL = "phosphor-gpio-presence@.service"
-INSTFMT = "phosphor-gpio-presence@{0}.service"
-TGT = "${SYSTEMD_DEFAULT_TARGET}"
-FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}"
-
-SYSTEMD_LINK_${PN}-presence_append_zaius += "${@compose_list(d, 'FMT', 'PCIE_CARD_E2B_INSTANCE')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_zaius += "obmc/gpio/phosphor-pcie-card-e2b.conf"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-pcie-card-e2b.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-pcie-card-e2b.conf
deleted file mode 100644
index cfc5414..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-pcie-card-e2b.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-INVENTORY=/system/chassis/pcie_card_e2b
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=39
-NAME=pcie_card_e2b
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
deleted file mode 100644
index 0f8396c..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Phosphor GPIO %I Presence
-Wants=mapper-wait@-xyz-openbmc_project-inventory.service
-After=mapper-wait@-xyz-openbmc_project-inventory.service
-ConditionPathExists={envfiledir}/obmc/gpio/phosphor-pcie-card-e2b.conf
-
-[Service]
-EnvironmentFile={envfiledir}/obmc/gpio/phosphor-pcie-card-e2b.conf
-ExecStart=/usr/bin/env phosphor-gpio-presence --path=${{DEVPATH}} --inventory=${{INVENTORY}} --key=${{KEY}} --name=${{NAME}}
-SyslogIdentifier=phosphor-gpio-presence
-
-[Install]
-RequiredBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop b/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop
deleted file mode 100644
index a94b241..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop
+++ /dev/null
@@ -1,4 +0,0 @@
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=47
-POLARITY=1
-TARGET=obmc-host-crash@0.target
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend
deleted file mode 100644
index 953b4b7..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-RDEPENDS_${PN} += 'refclock-fixup'
-RDEPENDS_${PN} += 'avsbus-control'
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/image/obmc-phosphor-image.bbappend
deleted file mode 100644
index aa57bbf..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/image/obmc-phosphor-image.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml
deleted file mode 100644
index bfe8e7e..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml
+++ /dev/null
@@ -1,15 +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'
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml
deleted file mode 100644
index 4fd637b..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml
+++ /dev/null
@@ -1,178 +0,0 @@
-0x03:
-  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
-0x05:
-  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
-0x07:
-  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
-0x21:
-  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
-0x6A:
-  sensorType: 0x07
-  path: /org/open_power/control/occ0
-  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
-0x71:
-  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
-0xBA:
-  sensorType: 0x07
-  path: /org/open_power/control/occ1
-  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
-0xFC:
-  sensorType: 0xCD
-  path: /system/chassis/pcie_card_e2b
-  sensorReadingType: 0x03
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  mutability: Mutability::Write|Mutability::Read
-  interfaces:
-    xyz.openbmc_project.Inventory.Item:
-      Present:
-        Offsets:
-          0x01:
-            assert: true
-            deassert: false
-            type: bool
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb
deleted file mode 100644
index 96d1674..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "Zaius 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-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml
deleted file mode 100644
index 8b32bd0..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml
+++ /dev/null
@@ -1,54 +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
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/mboxd/mboxd.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/mboxd/mboxd.bbappend
deleted file mode 100644
index 8b6248a..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/mboxd/mboxd.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-MBOXD_FLASH_SIZE = "64M"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
deleted file mode 100644
index f80bdb6..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-# Support OCC pass through and general occ control
-# Support for GPIO presence service
-RDEPENDS_${PN}-inventory_append_zaius = " openpower-occ-control virtual/obmc-gpio-presence"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
deleted file mode 100644
index 1aaa631..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ /dev/null
@@ -1,17 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-ZAIUS_CHIPS = "i2c@1e78a000/i2c-bus@40/ucd90160@64"
-ZAIUS_ITEMSFMT = "ahb/apb/{0}.conf"
-
-ZAIUS_ITEMS = "${@compose_list(d, 'ZAIUS_ITEMSFMT', 'ZAIUS_CHIPS')}"
-
-ZAIUS_OCCS = " \
-              00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \
-              00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \
-              "
-ZAIUS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf"
-ZAIUS_OCCITEMS = "${@compose_list(d, 'ZAIUS_OCCSFMT', 'ZAIUS_OCCS')}"
-
-ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ZAIUS_ITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ZAIUS_OCCITEMS')}"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf
deleted file mode 100644
index 92be7fe..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-LABEL_in1=vout1
-
-LABEL_in2=vout2
-
-LABEL_in3=vout3
-
-LABEL_in4=vout4
-
-LABEL_in5=vout5
-
-LABEL_in6=vout6
-
-LABEL_in7=vout7
-
-LABEL_in8=vout8
-
-LABEL_in9=vout9
-
-LABEL_in10=vout10
-
-LABEL_in11=vout11
-
-LABEL_in12=vout12
-
-LABEL_in13=vout13
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
deleted file mode 100644
index 6504151..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ /dev/null
@@ -1,83 +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"
-MODE_temp33 = "label"
-MODE_temp34 = "label"
-MODE_temp35 = "label"
-MODE_temp36 = "label"
-MODE_temp37 = "label"
-MODE_temp38 = "label"
-MODE_temp39 = "label"
-MODE_temp40 = "label"
-LABEL_temp34 = "p0_core0_temp"
-LABEL_temp37 = "p0_core1_temp"
-LABEL_temp40 = "p0_core2_temp"
-LABEL_temp43 = "p0_core3_temp"
-LABEL_temp46 = "p0_core4_temp"
-LABEL_temp49 = "p0_core5_temp"
-LABEL_temp52 = "p0_core6_temp"
-LABEL_temp55 = "p0_core7_temp"
-LABEL_temp58 = "p0_core8_temp"
-LABEL_temp61 = "p0_core9_temp"
-LABEL_temp64 = "p0_core10_temp"
-LABEL_temp67 = "p0_core11_temp"
-LABEL_temp70 = "p0_core12_temp"
-LABEL_temp73 = "p0_core13_temp"
-LABEL_temp76 = "p0_core14_temp"
-LABEL_temp79 = "p0_core15_temp"
-LABEL_temp82 = "p0_core16_temp"
-LABEL_temp85 = "p0_core17_temp"
-LABEL_temp88 = "p0_core18_temp"
-LABEL_temp91 = "p0_core19_temp"
-LABEL_temp94 = "p0_core20_temp"
-LABEL_temp97 = "p0_core21_temp"
-LABEL_temp100 = "p0_core22_temp"
-LABEL_temp103 = "p0_core23_temp"
-LABEL_temp224 = "dimm0_temp"
-LABEL_temp226 = "dimm1_temp"
-LABEL_temp228 = "dimm2_temp"
-LABEL_temp230 = "dimm3_temp"
-LABEL_temp232 = "dimm4_temp"
-LABEL_temp234 = "dimm5_temp"
-LABEL_temp236 = "dimm6_temp"
-LABEL_temp238 = "dimm7_temp"
-LABEL_temp240 = "dimm8_temp"
-LABEL_temp242 = "dimm9_temp"
-LABEL_temp244 = "dimm10_temp"
-LABEL_temp246 = "dimm11_temp"
-LABEL_temp248 = "dimm12_temp"
-LABEL_temp250 = "dimm13_temp"
-LABEL_temp252 = "dimm14_temp"
-LABEL_temp254 = "dimm15_temp"
-LABEL_power2 = "p0_power"
-LABEL_power3 = "p0_vdd_power"
-LABEL_power4 = "p0_vdn_power"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
deleted file mode 100644
index ba61581..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
+++ /dev/null
@@ -1,83 +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"
-MODE_temp33 = "label"
-MODE_temp34 = "label"
-MODE_temp35 = "label"
-MODE_temp36 = "label"
-MODE_temp37 = "label"
-MODE_temp38 = "label"
-MODE_temp39 = "label"
-MODE_temp40 = "label"
-LABEL_temp114 = "p1_core0_temp"
-LABEL_temp117 = "p1_core1_temp"
-LABEL_temp120 = "p1_core2_temp"
-LABEL_temp123 = "p1_core3_temp"
-LABEL_temp126 = "p1_core4_temp"
-LABEL_temp129 = "p1_core5_temp"
-LABEL_temp132 = "p1_core6_temp"
-LABEL_temp135 = "p1_core7_temp"
-LABEL_temp138 = "p1_core8_temp"
-LABEL_temp141 = "p1_core9_temp"
-LABEL_temp144 = "p1_core10_temp"
-LABEL_temp147 = "p1_core11_temp"
-LABEL_temp150 = "p1_core12_temp"
-LABEL_temp153 = "p1_core13_temp"
-LABEL_temp156 = "p1_core14_temp"
-LABEL_temp159 = "p1_core15_temp"
-LABEL_temp162 = "p1_core16_temp"
-LABEL_temp165 = "p1_core17_temp"
-LABEL_temp168 = "p1_core18_temp"
-LABEL_temp171 = "p1_core19_temp"
-LABEL_temp174 = "p1_core20_temp"
-LABEL_temp177 = "p1_core21_temp"
-LABEL_temp180 = "p1_core22_temp"
-LABEL_temp183 = "p1_core23_temp"
-LABEL_temp192 = "dimm16_temp"
-LABEL_temp194 = "dimm17_temp"
-LABEL_temp196 = "dimm18_temp"
-LABEL_temp198 = "dimm19_temp"
-LABEL_temp200 = "dimm20_temp"
-LABEL_temp202 = "dimm21_temp"
-LABEL_temp204 = "dimm22_temp"
-LABEL_temp206 = "dimm23_temp"
-LABEL_temp208 = "dimm24_temp"
-LABEL_temp210 = "dimm25_temp"
-LABEL_temp212 = "dimm26_temp"
-LABEL_temp224 = "dimm27_temp"
-LABEL_temp216 = "dimm28_temp"
-LABEL_temp218 = "dimm29_temp"
-LABEL_temp220 = "dimm30_temp"
-LABEL_temp222 = "dimm31_temp"
-LABEL_power2 = "p1_power"
-LABEL_power3 = "p1_vdd_power"
-LABEL_power4 = "p1_vdn_power"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager.bbappend
deleted file mode 100644
index 813a09d..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_append_zaius := ":${THISDIR}/${PN}"
-SRC_URI_append_zaius = " file://powerpolicy-default-ALWAYS_POWER_ON.override.yml"
-SRC_URI_append_zaius = " file://timeowner-host-no-ntp.override.yml"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/powerpolicy-default-ALWAYS_POWER_ON.override.yml b/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/powerpolicy-default-ALWAYS_POWER_ON.override.yml
deleted file mode 100644
index 7aff754..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/powerpolicy-default-ALWAYS_POWER_ON.override.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-/xyz/openbmc_project/control/host0/power_restore_policy:
-    - Interface: xyz.openbmc_project.Control.Power.RestorePolicy
-      Properties:
-          PowerRestorePolicy:
-              Default: RestorePolicy::Policy::AlwaysOn
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/timeowner-host-no-ntp.override.yml b/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/timeowner-host-no-ntp.override.yml
deleted file mode 100644
index abb1316..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/timeowner-host-no-ntp.override.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-/xyz/openbmc_project/time/owner:
-    - Interface: xyz.openbmc_project.Time.Owner
-      Properties:
-          TimeOwner:
-              Default: Owner::Owners::Host
-
-/xyz/openbmc_project/time/sync_method:
-    - Interface: xyz.openbmc_project.Time.Synchronization
-      Properties:
-          TimeSyncMethod:
-              Default: Synchronization::Method::Manual
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/workbook/zaius-config.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/workbook/zaius-config.bb
deleted file mode 100644
index 56117c4..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/workbook/zaius-config.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SUMMARY = "Zaius board wiring"
-DESCRIPTION = "Board wiring information for the Zaius OpenPOWER system."
-PR = "r1"
-
-inherit config-in-skeleton
diff --git a/meta-ingrasys/meta-zaius/recipes.txt b/meta-ingrasys/meta-zaius/recipes.txt
deleted file mode 100644
index c583668..0000000
--- a/meta-ingrasys/meta-zaius/recipes.txt
+++ /dev/null
@@ -1 +0,0 @@
-recipes-phosphor     - Phosphor OpenBMC applications and configuration
diff --git a/meta-inventec/conf/layer.conf b/meta-inventec/conf/layer.conf
deleted file mode 100644
index de22db1..0000000
--- a/meta-inventec/conf/layer.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-BBFILE_COLLECTIONS += "inventec"
-BBFILE_PATTERN_inventec = ""
diff --git a/meta-inventec/conf/machine/include/inventec.inc b/meta-inventec/conf/machine/include/inventec.inc
deleted file mode 100644
index c79ddd7..0000000
--- a/meta-inventec/conf/machine/include/inventec.inc
+++ /dev/null
@@ -1 +0,0 @@
-require conf/machine/include/openpower.inc
diff --git a/meta-inventec/meta-lanyang/conf/bblayers.conf.sample b/meta-inventec/meta-lanyang/conf/bblayers.conf.sample
deleted file mode 100644
index 296acc3..0000000
--- a/meta-inventec/meta-lanyang/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,33 +0,0 @@
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-LCONF_VERSION = "6"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang \
-  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang \
-  "
diff --git a/meta-inventec/meta-lanyang/conf/conf-notes.txt b/meta-inventec/meta-lanyang/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a..0000000
--- a/meta-inventec/meta-lanyang/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-inventec/meta-lanyang/conf/layer.conf b/meta-inventec/meta-lanyang/conf/layer.conf
deleted file mode 100644
index 64223a2..0000000
--- a/meta-inventec/meta-lanyang/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 += "lanyang"
-BBFILE_PATTERN_lanyang = ""
diff --git a/meta-inventec/meta-lanyang/conf/local.conf.sample b/meta-inventec/meta-lanyang/conf/local.conf.sample
deleted file mode 100644
index a4a3343..0000000
--- a/meta-inventec/meta-lanyang/conf/local.conf.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-MACHINE ??= "lanyang"
-DISTRO ?= "openbmc-openpower"
-PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
-    STOPTASKS,${TMPDIR},1G,100K \
-    STOPTASKS,${DL_DIR},1G,100K \
-    STOPTASKS,${SSTATE_DIR},1G,100K \
-    STOPTASKS,/tmp,100M,100K \
-    ABORT,${TMPDIR},100M,1K \
-    ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K \
-    ABORT,/tmp,10M,1K"
-CONF_VERSION = "1"
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
-  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
-  "
diff --git a/meta-inventec/meta-lanyang/conf/machine/lanyang.conf b/meta-inventec/meta-lanyang/conf/machine/lanyang.conf
deleted file mode 100644
index 4ca08b1..0000000
--- a/meta-inventec/meta-lanyang/conf/machine/lanyang.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
-
-UBOOT_MACHINE = "ast_g5_ncsi_config"
-
-FLASH_SIZE = "65536"
-
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "lanyang-ipmi-inventory-map-native"
-PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "lanyang-led-manager-config-native"
-
-require conf/machine/include/ast2500.inc
-require conf/machine/include/obmc-bsp-common.inc
-require conf/machine/include/inventec.inc
-require conf/machine/include/p9.inc
diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb b/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb
deleted file mode 100644
index ff68f39..0000000
--- a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Lanyang AVSBus control"
-DESCRIPTION = "Voltage regulator module (VRM) AVSBus control for Lanyang"
-PR = "r0"
-
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
-
-TMPL_OFF = "avsbus-disable@.service"
-TMPL_ON = "avsbus-enable@.service"
-INSTFMT_OFF = "avsbus-disable@{0}.service"
-INSTFMT_ON = "avsbus-enable@{0}.service"
-TGTFMT_OFF = "obmc-host-stop@{0}.target"
-TGTFMT_ON = "obmc-chassis-poweron@{0}.target"
-FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}"
-FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "${TMPL_ON}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}"
-
-SRC_URI += "file://lanyang_avsbus.sh"
-RDEPENDS_${PN} += "i2c-tools"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/lanyang_avsbus.sh ${D}${bindir}/lanyang_avsbus.sh
-}
diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
deleted file mode 100644
index add5f22..0000000
--- a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Disable AVSBus on VRMs
-Wants=obmc-power-stop-pre@%i.target
-Before=obmc-power-stop-pre@%i.target
-Conflicts=obmc-host-startmin@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env lanyang_avsbus.sh disable
-SyslogIdentifier=lanyang_avsbus.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-host-stop@%i.target
diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
deleted file mode 100644
index 787ec4c..0000000
--- a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Enable AVSBus on VRMs
-Wants=obmc-host-start-pre@%i.target
-Before=obmc-host-start-pre@%i.target
-Conflicts=obmc-host-stop@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env lanyang_avsbus.sh vdn_max
-ExecStart=/usr/bin/env lanyang_avsbus.sh enable
-SyslogIdentifier=lanyang_avsbus.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-RequiredBy=obmc-chassis-poweron@%i.target
diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/lanyang_avsbus.sh b/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/lanyang_avsbus.sh
deleted file mode 100755
index bf58def..0000000
--- a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/lanyang_avsbus.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh -e
-# AVSBus control for PMBUS voltage regulator modules (VRMs)
-# Switches output voltage target between
-# - VOUT_COMMAND register (AVSBus disabled, default on Zaius)
-# - AVSBus target output (AVSBus enabled, voltage set by host)
-
-cpu0_i2c_bus="5"
-cpu1_i2c_bus="6"
-busses="$cpu0_i2c_bus $cpu1_i2c_bus"
-vdd_i2c_addr_page="0x60:0x01"
-vdn_i2c_addr_page="0x64:0x01"
-vcs_i2c_addr_page="0x64:0x00"
-addrs_pages="$vdd_i2c_addr_page $vdn_i2c_addr_page $vcs_i2c_addr_page"
-
-# Usage: vrm_set_page <bus> <i2c_address> <page>
-vrm_set_page()
-{
-    i2cset -y $1 $2 0x00 $3 b
-}
-
-# Usage: vrm_avs_enable <bus> <i2c_address> <page>
-# Initializes the AVSBus VOUT setpoint to the value in PMBus VOUT_COMMAND
-# Sets OPERATION PMBUS register to
-# - Enable/Disable: On
-# - VOUT Source: AVSBus Target Rail Voltage
-# - AVSBus Copy: VOUT_COMMAND remains unchanged
-# Writes to VOUT setpoint over AVSBus will persist after the VRM is switched to
-# PMBus control. Switching back to AVSBus control restores this persisted
-# setpoint rather than re-initializing to PMBus VOUT_COMMAND. This behavior is
-# known to Intersil and writing VOUT_COMMAND over PMBus is the only workaround.
-vrm_avs_enable()
-{
-    vrm_set_page "$@"
-    echo Enabling AVSBus on bus $1 VRM @$2 rail $3...
-    local vout_command=`i2cget -y $1 $2 0x21 w`
-    i2cset -y $1 $2 0x21 $vout_command w
-    i2cset -y $1 $2 0x01 0xb0 b
-}
-
-# Usage: vrm_avs_disable <bus> <i2c_address> <page>
-# Sets OPERATION PMBUS register to
-# - Enable/Disable: On
-# - VOUT Source: VOUT_COMMAND
-# - AVSBus Copy: VOUT_COMMAND remains unchanged
-vrm_avs_disable()
-{
-    vrm_set_page "$@"
-    echo Disabling AVSBus on bus $1 VRM @$2 rail $3...
-    i2cset -y $1 $2 0x01 0x80 b
-}
-
-# Usage: vrm_vout_max_1v1 <bus> <i2c_address> <page>
-# Sets VOUT_MAX to 1.1V
-vrm_vout_max_1v1()
-{
-    vrm_set_page "$@"
-    echo Setting VOUT_MAX=[1.1V] on bus $1 VRM @$2 rail $3...
-    i2cset -y $1 $2 0x24 0x44c w
-}
-
-# Usage: vrm_print <bus> <i2c_address> <page>
-vrm_print()
-{
-    vrm_set_page "$@"
-    local operation=`i2cget -y $1 $2 0x01 b`
-    local vout=`i2cget -y $1 $2 0x8b w`
-    local iout=`i2cget -y $1 $2 0x8c w`
-    echo VRM on bus $1 @$2 rail $3: OPERATION=$operation VOUT=$vout IOUT=$iout
-}
-
-# Usage: for_each_rail <command>
-# <command> will be invoked with <bus> <i2c_address> <page>
-for_each_rail()
-{
-    for bus in $busses
-    do
-        for addr_page in $addrs_pages
-        do
-            $1 $bus `echo $addr_page | tr : " "`
-        done
-    done
-}
-
-if [ "$1" == "enable" ]
-then
-    for_each_rail vrm_avs_enable
-elif [ "$1" == "disable" ]
-then
-    for_each_rail vrm_avs_disable
-elif [ "$1" == "vdn_max" ]
-then
-    addrs_pages="$vdn_i2c_addr_page"
-    for_each_rail vrm_vout_max_1v1
-else
-    for_each_rail vrm_print
-    echo "\"$0 <enable|disable>\" to control whether VRMs use AVSBus"
-    echo "\"$0 <vdn_max>\" to set VDN rails VOUT_MAX to 1.1V"
-fi
diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-inventec/meta-lanyang/recipes-phosphor/console/obmc-console/obmc-console.conf
deleted file mode 100644
index a5ba3f3..0000000
--- a/meta-inventec/meta-lanyang/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-inventec/meta-lanyang/recipes-phosphor/console/obmc-console_%.bbappend b/meta-inventec/meta-lanyang/recipes-phosphor/console/obmc-console_%.bbappend
deleted file mode 100644
index ab94de8..0000000
--- a/meta-inventec/meta-lanyang/recipes-phosphor/console/obmc-console_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_lanyang := "${THISDIR}/${PN}:"
diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/host/p9-host-start.bbappend b/meta-inventec/meta-lanyang/recipes-phosphor/host/p9-host-start.bbappend
deleted file mode 100644
index e2fe9f2..0000000
--- a/meta-inventec/meta-lanyang/recipes-phosphor/host/p9-host-start.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-RDEPENDS_${PN} += 'avsbus-control'
-RDEPENDS_${PN}_remove += "p9-vcs-workaround"
diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-inventec/meta-lanyang/recipes-phosphor/image/obmc-phosphor-image.bbappend
deleted file mode 100644
index aa57bbf..0000000
--- a/meta-inventec/meta-lanyang/recipes-phosphor/image/obmc-phosphor-image.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd"
diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config-native.bb b/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config-native.bb
deleted file mode 100644
index 083002e..0000000
--- a/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config-native.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Phosphor LED Group Management for Lanyang"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-
-PROVIDES += "virtual/phosphor-led-manager-config-native"
-
-SRC_URI += "file://led.yaml"
-S = "${WORKDIR}"
-
-# Overwrite the example led layout yaml file prior
-# to building the phosphor-led-manager package
-do_install() {
-    SRC=${S}
-    DEST=${D}${datadir}/phosphor-led-manager
-    install -D ${SRC}/led.yaml ${DEST}/led.yaml
-}
diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config/led.yaml b/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config/led.yaml
deleted file mode 100755
index 5eb11f1..0000000
--- a/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config/led.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-bmc_booted:
-    sys_boot_status:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-        Priority: 'On'
-
-power_on:
-    sys_boot_status:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'On'
-
-enclosure_fault:
-    plt_fault:
-        Action: 'On'
-
-enclosure_identify:
-    attention:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-
-lamp_test:
-    plt_fault:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-    attention:
-        Action: 'On'
diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/mboxd/mboxd.bbappend b/meta-inventec/meta-lanyang/recipes-phosphor/mboxd/mboxd.bbappend
deleted file mode 100644
index 8b6248a..0000000
--- a/meta-inventec/meta-lanyang/recipes-phosphor/mboxd/mboxd.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-MBOXD_FLASH_SIZE = "64M"
diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/workbook/lanyang-config.bb b/meta-inventec/meta-lanyang/recipes-phosphor/workbook/lanyang-config.bb
deleted file mode 100644
index 1798dad..0000000
--- a/meta-inventec/meta-lanyang/recipes-phosphor/workbook/lanyang-config.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SUMMARY = "Lanyang board wiring"
-DESCRIPTION = "Board wiring information for the Lanyang OpenPOWER system."
-PR = "r1"
-
-inherit config-in-skeleton
diff --git a/meta-rackspace/conf/layer.conf b/meta-rackspace/conf/layer.conf
deleted file mode 100644
index 9bc3e93..0000000
--- a/meta-rackspace/conf/layer.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-BBFILE_COLLECTIONS += "rackspace"
-BBFILE_PATTERN_rackspace = ""
diff --git a/meta-rackspace/conf/machine/include/rackspace.inc b/meta-rackspace/conf/machine/include/rackspace.inc
deleted file mode 100644
index c79ddd7..0000000
--- a/meta-rackspace/conf/machine/include/rackspace.inc
+++ /dev/null
@@ -1 +0,0 @@
-require conf/machine/include/openpower.inc
diff --git a/meta-rackspace/meta-barreleye/README.md b/meta-rackspace/meta-barreleye/README.md
deleted file mode 100644
index 66660f7..0000000
--- a/meta-rackspace/meta-barreleye/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-POWER8 Barreleye
-================
-
-This is the POWER8 Barreleye machine layer.
-
-POWER8 Barreleye is no longer a supported machine.
diff --git a/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample b/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
deleted file mode 100644
index 6bd2bf6..0000000
--- a/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,35 +0,0 @@
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-LCONF_VERSION = "7"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye \
-  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye \
-  "
diff --git a/meta-rackspace/meta-barreleye/conf/conf-notes.txt b/meta-rackspace/meta-barreleye/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a..0000000
--- a/meta-rackspace/meta-barreleye/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-rackspace/meta-barreleye/conf/layer.conf b/meta-rackspace/meta-barreleye/conf/layer.conf
deleted file mode 100644
index 7d1dd17..0000000
--- a/meta-rackspace/meta-barreleye/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 += "barreleye"
-BBFILE_PATTERN_barreleye = ""
diff --git a/meta-rackspace/meta-barreleye/conf/local.conf.sample b/meta-rackspace/meta-barreleye/conf/local.conf.sample
deleted file mode 100644
index 897f5fe..0000000
--- a/meta-rackspace/meta-barreleye/conf/local.conf.sample
+++ /dev/null
@@ -1,246 +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 ??= "barreleye"
-
-#
-# 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"
-
-
-#
-# Qemu configuration
-#
-# By default qemu will build with a builtin VNC server where graphical output can be
-# seen. The two lines below enable the SDL backend too. This assumes there is a
-# libsdl library available on your build system.
-PACKAGECONFIG_append_pn-qemu-native = " sdl"
-PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
-#ASSUME_PROVIDED += "libsdl-native"
-
-
-# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
-# track the version of this file when it was generated. This can safely be ignored if
-# this doesn't mean anything to you.
-CONF_VERSION = "1"
-
-# Set the root password to '0penBmc'
-INHERIT += "extrausers"
-
-EXTRA_USERS_PARAMS = " \
-  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
-  "
-
diff --git a/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf b/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
deleted file mode 100644
index 2d16c2e..0000000
--- a/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
+++ /dev/null
@@ -1,20 +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/rackspace.inc
-
-UBOOT_MACHINE_barreleye = "ast_g4_ncsi_config"
-UBOOT_ENTRYPOINT = "0x40008000"
-UBOOT_LOADADDRESS = "0x40008000"
-
-FLASH_SIZE = "32768"
-
-OBMC_FAN_INSTANCES = "0 1 2 3 4 5"
-
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "barreleye-ipmi-inventory-map-native"
-PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "barreleye-led-manager-config-native"
-
-# Package exclusions - Exclude packages included by default in the common image
-IMAGE_INSTALL_remove = "packagegroup-obmc-apps-extrasdev"
diff --git a/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed/barreleye.cfg b/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed/barreleye.cfg
deleted file mode 100644
index f778394..0000000
--- a/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed/barreleye.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_SENSORS_NCT7904=y
-CONFIG_SENSORS_LM75=y
-CONFIG_EEPROM_AT24=y
diff --git a/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed_%.bbappend
deleted file mode 100644
index 8a12f92..0000000
--- a/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend_barreleye := "${THISDIR}/${PN}:"
-SRC_URI += "file://barreleye.cfg"
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend b/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
deleted file mode 100644
index 3d324a1..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-NAMES = "io_board/bmc/ethernet motherboard"
-ITEMSFMT = "system/chassis/{0}"
-ITEMS_ESCAPEDFMT = "system-chassis-{0}"
-
-ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}"
-ITEMS_ESCAPED = "${@compose_list(d, 'ITEMS_ESCAPEDFMT', 'NAMES')}"
-
-ENVS = "obmc/sync_inventory_item/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}"
-
-TMPL = "obmc-sync-inventory-item@.service"
-TGT = "${SYSTEMD_DEFAULT_TARGET}"
-INSTFMT = "obmc-sync-inventory-item@{0}.service"
-FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}"
-
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ITEMS_ESCAPED')}"
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board/bmc/ethernet b/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board/bmc/ethernet
deleted file mode 100644
index 722e0e6..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board/bmc/ethernet
+++ /dev/null
@@ -1,2 +0,0 @@
-PROPERTY="MACAddress"
-SYNC_TYPE=mac
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard b/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard
deleted file mode 100644
index 95abbc8..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard
+++ /dev/null
@@ -1,2 +0,0 @@
-PROPERTY="UUID"
-SYNC_TYPE=uuid
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/fans/obmc-control-fan%.bbappend b/meta-rackspace/meta-barreleye/recipes-phosphor/fans/obmc-control-fan%.bbappend
deleted file mode 100644
index c4abaf6..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/fans/obmc-control-fan%.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SVC = "obmc-max-fans.service"
-TGTFMT = "obmc-power-start@{0}.target"
-FMT = "../${SVC}:${TGTFMT}.wants/${SVC}"
-
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_POWER_INSTANCES')}"
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/host/checkstop-monitor.bbappend b/meta-rackspace/meta-barreleye/recipes-phosphor/host/checkstop-monitor.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/host/checkstop-monitor.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop b/meta-rackspace/meta-barreleye/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop
deleted file mode 100644
index b47d0df..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop
+++ /dev/null
@@ -1,4 +0,0 @@
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=125
-POLARITY=1
-TARGET=obmc-host-crash@0.target
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map-native.bb b/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map-native.bb
deleted file mode 100644
index 8b9e3ce..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map-native.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "Barreleye 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-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml b/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml
deleted file mode 100644
index 67ca0ba..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml
+++ /dev/null
@@ -1,1239 +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:
-    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
-100:
-    /system/chassis/io_board:
-      entityID: 44
-      entityInstance: 1
-      interfaces:
-        xyz.openbmc_project.Inventory.Item:
-          PrettyName:
-            IPMIFruSection: Board
-            IPMIFruProperty: Name
-        xyz.openbmc_project.Inventory.Decorator.Asset:
-          PartNumber:
-            IPMIFruSection: Board
-            IPMIFruProperty: Part Number
-          SerialNumber:
-            IPMIFruSection: Board
-            IPMIFruProperty: Serial Number
-          Manufacturer:
-            IPMIFruSection: Board
-            IPMIFruProperty: Manufacturer
-          BuildDate:
-            IPMIFruSection: Board
-            IPMIFruProperty: Mfg Date
-
-    /system/chassis/io_board/bmc/ethernet:
-      entityID: 1
-      entityInstance: 1
-      interfaces:
-        xyz.openbmc_project.Inventory.Item.NetworkInterface:
-          MACAddress:
-            IPMIFruSection: Board
-            IPMIFruProperty: Custom Field 2
-        xyz.openbmc_project.Inventory.Item:
-          PrettyName:
-            IPMIFruSection: Board
-            IPMIFruProperty: Name
-101:
-    /system/chassis/sas_expander:
-      entityID: 11
-      entityInstance: 1
-      interfaces:
-        xyz.openbmc_project.Inventory.Item:
-          PrettyName:
-            IPMIFruSection: Board
-            IPMIFruProperty: Name
-        xyz.openbmc_project.Inventory.Decorator.Asset:
-          PartNumber:
-            IPMIFruSection: Board
-            IPMIFruProperty: Part Number
-          SerialNumber:
-            IPMIFruSection: Board
-            IPMIFruProperty: Serial Number
-          Manufacturer:
-            IPMIFruSection: Board
-            IPMIFruProperty: Manufacturer
-          BuildDate:
-            IPMIFruSection: Board
-            IPMIFruProperty: Mfg Date
-
-102:
-    /system/chassis/hdd_backplane:
-      entityID: 23
-      entityInstance: 1
-      interfaces:
-        xyz.openbmc_project.Inventory.Item:
-          PrettyName:
-            IPMIFruSection: Board
-            IPMIFruProperty: Name
-        xyz.openbmc_project.Inventory.Decorator.Asset:
-          PartNumber:
-            IPMIFruSection: Board
-            IPMIFruProperty: Part Number
-          SerialNumber:
-            IPMIFruSection: Board
-            IPMIFruProperty: Serial Number
-          Manufacturer:
-            IPMIFruSection: Board
-            IPMIFruProperty: Manufacturer
-          BuildDate:
-            IPMIFruSection: Board
-            IPMIFruProperty: Mfg Date
-
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend b/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend
deleted file mode 100644
index 05e1c09..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-EEPROM_NAMES = "io_board motherboard sas_expander hdd_backplane"
-
-EEPROMFMT = "system/chassis/{0}"
-EEPROM_ESCAPEDFMT = "system-chassis-{0}"
-EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}"
-EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}"
-
-ENVFMT = "obmc/eeproms/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
-
-TMPL = "obmc-read-eeprom@.service"
-TGT = "${SYSTEMD_DEFAULT_TARGET}"
-INSTFMT = "obmc-read-eeprom@{0}.service"
-FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}"
-
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/hdd_backplane b/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/hdd_backplane
deleted file mode 100644
index b1ed875..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/hdd_backplane
+++ /dev/null
@@ -1,2 +0,0 @@
-SYSFS_PATH=/sys/bus/i2c/devices/6-0055/eeprom
-FRUID=66
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/io_board b/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/io_board
deleted file mode 100644
index 6a11a3d..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/io_board
+++ /dev/null
@@ -1,2 +0,0 @@
-SYSFS_PATH=/sys/bus/i2c/devices/0-0050/eeprom
-FRUID=64
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard b/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard
deleted file mode 100644
index ff73090..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/motherboard
+++ /dev/null
@@ -1,2 +0,0 @@
-SYSFS_PATH=/sys/bus/i2c/devices/4-0054/eeprom
-FRUID=3
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/sas_expander b/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/sas_expander
deleted file mode 100644
index 5bc455d..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru%/obmc/eeproms/system/chassis/sas_expander
+++ /dev/null
@@ -1,2 +0,0 @@
-SYSFS_PATH=/sys/bus/i2c/devices/6-0051/eeprom
-FRUID=65
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend b/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml b/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml
deleted file mode 100644
index 8addfd5..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml
+++ /dev/null
@@ -1,375 +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'
-
-/system/chassis/io_board:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'false'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/hdd_backplane:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'false'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
-
-/system/chassis/sas_expander:
-    xyz.openbmc_project.Inventory.Decorator.Replaceable:
-        FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Decorator.Cacheable:
-        Cached: 'false'
-    xyz.openbmc_project.Inventory.Item:
-        Present: 'true'
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend b/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml b/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml
deleted file mode 100755
index f2f947b..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml
+++ /dev/null
@@ -1,1636 +0,0 @@
-0x05:
-  sensorType: 0x0F
-  path: /xyz/openbmc_project/state/host0
-  sensorReadingType: 0x6F
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: eventdata2
-  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_3_0050
-  sensorReadingType: 0x09
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: assertion
-  interfaces:
-    org.open_power.OCC.Status:
-      OccActive:
-        Offsets:
-          0x00:
-            assert: false
-            deassert: true
-            type: bool
-          0x01:
-            assert: true
-            deassert: false
-            type: bool
-0x09:
-  sensorType: 0xC3
-  path: /xyz/openbmc_project/state/host0
-  sensorReadingType: 0x6F
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: readingAssertion
-  interfaces:
-    xyz.openbmc_project.Control.Boot.RebootAttempts:
-      AttemptsLeft:
-        Offsets:
-          0xFF:
-            type: uint32_t
-0x0A:
-  sensorType: 0x07
-  path: /org/open_power/control/occ_3_0051
-  sensorReadingType: 0x09
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: assertion
-  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
-  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
-  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
-0x10:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm0
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0x11:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm1
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0x12:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm2
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0x13:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm3
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0x14:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm4
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0x15:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm5
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0x16:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm6
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0x17:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm7
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0x18:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm8
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0x19:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm9
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0x1a:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm10
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0x1b:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm11
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0x1c:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm12
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0x1d:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm13
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0x1e:
-  sensorType: 0x0C
-  path: /system/chassis/motherboard/dimm14
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm15
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm16
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm17
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm18
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm19
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm20
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm21
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm22
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm23
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm24
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm25
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm26
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm27
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm28
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm29
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm30
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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/dimm31
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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: 0x1F
-  path: /xyz/openbmc_project/state/host0
-  sensorReadingType: 0x6F
-  serviceInterface: org.freedesktop.DBus.Properties
-  readingType: assertion
-  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
-0xc8:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core0
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xc9:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core1
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xca:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core2
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xcb:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core3
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xcc:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core4
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xcd:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core5
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xce:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core6
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xcf:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core7
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xd0:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core8
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xd1:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core9
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xd2:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core10
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xd3:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu0/core11
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xd4:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core0
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xd5:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core1
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xd6:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core2
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xd7:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core3
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xd8:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core4
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xd9:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core5
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xda:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core6
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xdb:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core7
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xdc:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core8
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xdd:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core9
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xde:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core10
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
-0xdf:
-  sensorType: 0x07
-  path: /system/chassis/motherboard/cpu1/core11
-  sensorReadingType: 0x6F
-  serviceInterface: xyz.openbmc_project.Inventory.Manager
-  readingType: assertion
-  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
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/leds/barreleye-led-manager-config-native.bb b/meta-rackspace/meta-barreleye/recipes-phosphor/leds/barreleye-led-manager-config-native.bb
deleted file mode 100644
index daf5d18..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/leds/barreleye-led-manager-config-native.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "Phosphor LED Group Management for Barreleye"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-
-PROVIDES += "virtual/phosphor-led-manager-config-native"
-
-SRC_URI += "file://led.yaml"
-S = "${WORKDIR}"
-
-# Copies example led layout yaml file
-do_install() {
-    SRC=${S}
-    DEST=${D}${datadir}/phosphor-led-manager
-    install -D ${SRC}/led.yaml ${DEST}/led.yaml
-}
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/leds/barreleye-led-manager-config/led.yaml b/meta-rackspace/meta-barreleye/recipes-phosphor/leds/barreleye-led-manager-config/led.yaml
deleted file mode 100755
index 8ba28f3..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/leds/barreleye-led-manager-config/led.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-BmcBooted:
-    heartbeat:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-PowerOn:
-    beep:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-EnclosureFault:
-    identify:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-EnclosureIdentify:
-    identify:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-LampTest:
-    beep:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-    heartbeat:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-    identify:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
deleted file mode 100644
index 46972bd..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-CHIPS = " \
-        i2c@1e78a000/i2c-bus@40/lm75@4a \
-        i2c@1e78a000/i2c-bus@40/rtc@68 \
-        i2c@1e78a000/i2c-bus@1c0/nct7904@2e \
-        i2c@1e78a000/i2c-bus@1c0/nct7904@2d \
-        "
-
-ITEMSFMT = "ahb/apb/{0}.conf"
-
-ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
-
-ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}"
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nct7904@2d.conf b/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nct7904@2d.conf
deleted file mode 100644
index eae2401..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nct7904@2d.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-LABEL_fan1=fan5L
-LABEL_fan2=fan5H
-LABEL_fan3=fan4L
-LABEL_fan4=fan4H
-LABEL_fan5=fan3L
-LABEL_fan6=fan3H
-LABEL_in1=p1v35_cpu0_buf4
-LABEL_in2=p0v9_cpu0_buf1
-LABEL_in3=p0v9_cpu0_buf2
-LABEL_in4=p0v9_cpu0_buf3
-LABEL_in5=p0v9_cpu0_buf4
-LABEL_in6=p1v09_cpu0_buf1
-LABEL_in7=p1v09_cpu0_buf2
-LABEL_in8=p1v09_cpu0_buf3
-LABEL_in9=p1v09_cpu0_buf4
-LABEL_in10=p0v97_cpu0
-LABEL_in11=p1v1_mem0
-LABEL_in12=p1v35_cpu0_buf1
-LABEL_in13=p1v35_cpu0_buf2
-LABEL_in14=p1v35_cpu0_buf3
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nct7904@2e.conf b/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nct7904@2e.conf
deleted file mode 100644
index 394cf21..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nct7904@2e.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-LABEL_fan1=fan2L
-LABEL_fan2=fan2H
-LABEL_fan3=fan1L
-LABEL_fan4=fan1H
-LABEL_fan5=fan0L
-LABEL_fan6=fan0H
-LABEL_in1=p1v35_cpu1_buf4
-LABEL_in2=p0v9_cpu1_buf1
-LABEL_in3=p0v9_cpu1_buf2
-LABEL_in4=p0v9_cpu1_buf3
-LABEL_in5=p0v9_cpu1_buf4
-LABEL_in6=p1v09_cpu1_buf1
-LABEL_in7=p1v09_cpu1_buf2
-LABEL_in8=p1v09_cpu1_buf3
-LABEL_in9=p1v09_cpu1_buf4
-LABEL_in10=p0v97_cpu1
-LABEL_in11=p1v1_mem1
-LABEL_in12=p1v35_cpu1_buf1
-LABEL_in13=p1v35_cpu1_buf2
-LABEL_in14=p1v35_cpu1_buf3
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/lm75@4a.conf b/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/lm75@4a.conf
deleted file mode 100644
index a9c9ab8..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/lm75@4a.conf
+++ /dev/null
@@ -1 +0,0 @@
-LABEL_temp1=ambient
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/rtc@68.conf b/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/rtc@68.conf
deleted file mode 100644
index 6a9442c..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/rtc@68.conf
+++ /dev/null
@@ -1 +0,0 @@
-LABEL_temp1=rtc
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/workbook/barreleye-config.bb b/meta-rackspace/meta-barreleye/recipes-phosphor/workbook/barreleye-config.bb
deleted file mode 100644
index a72f1e9..0000000
--- a/meta-rackspace/meta-barreleye/recipes-phosphor/workbook/barreleye-config.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SUMMARY = "Barreleye board wiring"
-DESCRIPTION = "Board wiring information for the Barreleye system."
-PR = "r1"
-
-inherit config-in-skeleton
diff --git a/meta-rackspace/meta-barreleye/recipes.txt b/meta-rackspace/meta-barreleye/recipes.txt
deleted file mode 100644
index 2f89155..0000000
--- a/meta-rackspace/meta-barreleye/recipes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-recipes-bsp          - Anything with links to specific hardware or hardware configuration information
-recipes-kernel       - The kernel and generic applications/libraries with strong kernel dependencies
-recipes-phosphor     - Phosphor OpenBMC applications and configuration