diff --git a/meta-qualcomm/conf/layer.conf b/meta-qualcomm/conf/layer.conf
deleted file mode 100644
index 5079054..0000000
--- a/meta-qualcomm/conf/layer.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-BBFILE_COLLECTIONS += "qualcomm"
-BBFILE_PATTERN_qualcomm = ""
diff --git a/meta-qualcomm/conf/machine/include/qualcomm.inc b/meta-qualcomm/conf/machine/include/qualcomm.inc
deleted file mode 100644
index 976e2d0..0000000
--- a/meta-qualcomm/conf/machine/include/qualcomm.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-require conf/machine/include/arm.inc
-
-VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
diff --git a/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample b/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample
deleted file mode 100644
index c561f76..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/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-arm \
-  ##OEROOT##/meta-openbmc-machines/meta-arm/meta-qualcomm \
-  ##OEROOT##/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep \
-  "
-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-arm \
-  ##OEROOT##/meta-openbmc-machines/meta-arm/meta-qualcomm \
-  ##OEROOT##/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep \
-  "
diff --git a/meta-qualcomm/meta-centriq2400-rep/conf/conf-notes.txt b/meta-qualcomm/meta-centriq2400-rep/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-qualcomm/meta-centriq2400-rep/conf/layer.conf b/meta-qualcomm/meta-centriq2400-rep/conf/layer.conf
deleted file mode 100644
index 670fd43..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/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 += "centriq2400-rep"
-BBFILE_PATTERN_centriq2400-rep = ""
diff --git a/meta-qualcomm/meta-centriq2400-rep/conf/local.conf.sample b/meta-qualcomm/meta-centriq2400-rep/conf/local.conf.sample
deleted file mode 100644
index e054bef..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/conf/local.conf.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-MACHINE ??= "centriq2400-rep"
-DISTRO ?= "openbmc-phosphor"
-PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
-    STOPTASKS,${TMPDIR},1G,100K \
-    STOPTASKS,${DL_DIR},1G,100K \
-    STOPTASKS,${SSTATE_DIR},1G,100K \
-    STOPTASKS,/tmp,100M,100K \
-    ABORT,${TMPDIR},100M,1K \
-    ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K \
-    ABORT,/tmp,10M,1K"
-CONF_VERSION = "1"
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
-  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
-  "
diff --git a/meta-qualcomm/meta-centriq2400-rep/conf/machine/centriq2400-rep.conf b/meta-qualcomm/meta-centriq2400-rep/conf/machine/centriq2400-rep.conf
deleted file mode 100644
index 3bbff9a..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/conf/machine/centriq2400-rep.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-ast2500-evb.dtb"
-
-UBOOT_MACHINE = "ast_g5_ncsi_config"
-
-FLASH_SIZE = "32768"
-
-
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config= ""
-require conf/machine/include/ast2500.inc
-require conf/machine/include/obmc-bsp-common.inc
-require conf/machine/include/qualcomm.inc
-
-IMAGE_INSTALL_append = " ir38163-workaround \
-                         centriq-2400rep-console-client \
-                         socupdate \
-"
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-kernel/linux/linux-aspeed/centriq2400-rep.cfg b/meta-qualcomm/meta-centriq2400-rep/recipes-kernel/linux/linux-aspeed/centriq2400-rep.cfg
deleted file mode 100644
index 2182623..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-kernel/linux/linux-aspeed/centriq2400-rep.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-CONFIG_I2C_MUX=y
-CONFIG_I2C_MUX_PCA9541=y
-CONFIG_I2C_MUX_PCA9641=y
-CONFIG_I2C_MUX_PCA954x=y
-CONFIG_SENSORS_ASPEED=y
-CONFIG_SENSORS_TMP421=y
-CONFIG_ASPEED_ADC=y
-CONFIG_SENSORS_IIO_HWMON=y
-CONFIG_I2C_SLAVE=y
-CONFIG_SSIF_SMBUS_SLAVE=y
-CONFIG_PMBUS=y
-CONFIG_SENSORS_PXM1310=y
-CONFIG_SENSORS_DS1100=y
-CONFIG_SENSORS_TMP421=y
-CONFIG_SENSORS_NVT210=y
-CONFIG_SENSORS_IR38163=y
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_SPIDEV=y
-CONFIG_SPI_ASPEED=y
-CONFIG_SENSORS_CENTRIQ_SPI=y
-CONFIG_SENSORS_MAX31790=y
-CONFIG_EEPROM_AT24=y
-CONFIG_ARCH_AST2500=y
-CONFIG_AST_JTAG=y
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-qualcomm/meta-centriq2400-rep/recipes-kernel/linux/linux-aspeed_%.bbappend
deleted file mode 100644
index 573e298..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend_centriq2400-rep := "${THISDIR}/${PN}:"
-SRC_URI += "file://centriq2400-rep.cfg"
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb
deleted file mode 100644
index 85c2e93..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SUMMARY = "centriq2400 VR sensor Re-Probe"
-DESCRIPTION = "IR38163 work on DC on state, need re-probe for centriq2400 HW design"
-PR = "r0"
-
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
-
-PROVIDES += 'virtual/ir38163-workaround'
-RPROVIDES_${PN} += 'virtual-ir38163-workaround'
-
-IR_REMOVE = "ir-remove@.service"
-IR_ADD = "ir-add@.service"
-INSTIR_REMOVE = "ir-remove@{0}.service"
-INSTIR_ADD = "ir-add@{0}.service"
-TGTFMT_OFF = "obmc-chassis-poweroff@{0}.target"
-TGTFMT_ON = "obmc-chassis-poweron@{0}.target"
-FMT_REMOVE = "../${IR_REMOVE}:${TGTFMT_OFF}.wants/${INSTIR_REMOVE}"
-FMT_ADD = "../${IR_ADD}:${TGTFMT_ON}.requires/${INSTIR_ADD}"
-
-SYSTEMD_SERVICE_${PN} += "${IR_REMOVE}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_REMOVE', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "${IR_ADD}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ADD', 'OBMC_CHASSIS_INSTANCES')}"
-
-SRC_URI += "file://ir38163_workaround.sh"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/ir38163_workaround.sh ${D}${bindir}/ir38163_workaround.sh
-}
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround/ir-add@.service b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround/ir-add@.service
deleted file mode 100644
index 0b3574b..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround/ir-add@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Add IR38163 device
-Wants=obmc-power-start@%i.target
-Before=obmc-power-start@%i.target
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env ir38163_workaround.sh add
-SyslogIdentifier=ir38163_workaround.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-host-start@%i.target
-
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround/ir-remove@.service b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround/ir-remove@.service
deleted file mode 100644
index 15e8d01..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround/ir-remove@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Remove IR38163 device
-After=obmc-power-off@%i.target
-Conflicts=obmc-chassis-poweron@%i.target
-
-[Service]
-ExecStart=/usr/bin/env ir38163_workaround.sh rm
-SyslogIdentifier=ir38163_workaround.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-host-stop@%i.target
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround/ir38163_workaround.sh b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround/ir38163_workaround.sh
deleted file mode 100644
index 60120cf..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround/ir38163_workaround.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-# For one of the IR38163 device on i2c bus 5, address 0x42
-# Because the device only work when DC-ON, so when BMC during the DC-OFF state
-# the device will probe fail, need the workaround for this HW design..
-
-if [ "$1" == "add" ]; then
-    echo Add the 0x42 device on i2c bus 5....
-    sleep 2
-    echo 5-0042 > /sys/bus/i2c/drivers/ir38163/bind
-    sleep 1
-elif [ "$1" == "rm" ]; then
-    echo Remove the 0x42 deivce
-    sleep 2
-    echo 5-0042 > /sys/bus/i2c/drivers/ir38163/unbind
-    sleep 1
-else
-    echo "$0 <add|rm>" to set state
-fi
-
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client.bb
deleted file mode 100644
index 4c8dc15..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_prepend_centriq2400-rep := "${THISDIR}/${PN}:"
-inherit obmc-phosphor-license
-
-SRC_URI += "file://centriq-2400rep-console-client.sh"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/centriq-2400rep-console-client.sh ${D}${bindir}/centriq-2400rep-console-client.sh
-}
-
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client/centriq-2400rep-console-client.sh b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client/centriq-2400rep-console-client.sh
deleted file mode 100644
index 3ecd0f8..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client/centriq-2400rep-console-client.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-#Control UART mux for obmc-console-client
-echo 0 > /sys/class/gpio/gpio325/value
-obmc-console-client
-echo 1 > /sys/class/gpio/gpio325/value
-
-
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client/centriq-2400rep-console-client@.service b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client/centriq-2400rep-console-client@.service
deleted file mode 100644
index 81d3bfe..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client/centriq-2400rep-console-client@.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Control UART mux for obmc-console-client
-
-[Service]
-ExecStart=/usr/bin/env centriq-2400rep-console-client.sh
-SyslogIdentifier=centriq-2400rep-console-client.sh
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/obmc-console/obmc-console.conf
deleted file mode 100644
index 85f35c1..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/obmc-console/obmc-console.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-local-tty = ttyS2
-local-tty-baud = 115200
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/obmc-console_%.bbappend b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/obmc-console_%.bbappend
deleted file mode 100644
index 101fe64..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/obmc-console_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend_centriq2400-rep := "${THISDIR}/${PN}:"
-OBMC_CONSOLE_HOST_TTY = "ttyS2"
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb
deleted file mode 100644
index 7d0e777..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "Phosphor LED Group Management for Centriq2400 REP"
-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-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config/led.yaml b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config/led.yaml
deleted file mode 100755
index 25d2ef4..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config/led.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-bmc_booted:
-power_on:
-    Power_ID_LED:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-enclosure_fault:
-    RAS_ERROR_LED:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-    System_FAULT:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
deleted file mode 100644
index 5d89e82..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ /dev/null
@@ -1,34 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-NAMES = " apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d \
-         apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f \
-         apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d \
-         apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f \
-         apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c \
-         apb/i2c@1e78a000/i2c-bus@180/ir38163@42 \
-         apb/i2c@1e78a000/i2c-bus@180/ir38163@44 \
-         apb/i2c@1e78a000/i2c-bus@180/ir38163@46 \
-         apb/i2c@1e78a000/i2c-bus@180/ir38163@48 \
-         apb/i2c@1e78a000/i2c-bus@180/pxm1310@02 \
-         apb/i2c@1e78a000/i2c-bus@180/pxm1310@04 \
-         apb/i2c@1e78a000/i2c-bus@80/tmp421@1c \
-         apb/i2c@1e78a000/i2c-bus@80/tmp421@1e \
-         apb/i2c@1e78a000/i2c-bus@80/tmp421@2a \
-         apb/i2c@1e78a000/i2c-bus@80/tmp421@4e \
-         apb/i2c@1e78a000/i2c-bus@300/adm1278@10 \
-         apb/i2c@1e78a000/i2c-bus@300/adm1278@11 \
-         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12 \
-         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20 \
-         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23 \
-         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d \
-         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58 \
-         flash-controller@1e631000/spi2@0 \
-"
-
-ITEMSFMT = "ahb/{0}.conf"
-
-ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}"
-ITEMS += "iio-hwmon.conf"
-
-ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}"
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf
deleted file mode 100644
index e968f08..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LABEL_temp1=SYS_SOC_TEMP_L
-CRITLO_temp1=0
-CRITHI_temp1=100000
-
-LABEL_temp2=SYS_SOC_TEMP_R
-CRITLO_temp2=0
-CRITHI_temp2=100000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf
deleted file mode 100644
index a1ba061..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_in1=VREG_5P0
-WARNLO_in1=4758
-WARNHI_in1=5258
-CRITLO_in1=4507
-CRITHI_in1=5509
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf
deleted file mode 100644
index 8edf80c..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_in1=VREG_3P3
-WARNLO_in1=3130
-WARNHI_in1=3474
-CRITLO_in1=2974
-CRITHI_in1=3631
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf
deleted file mode 100644
index b083035..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_in1=VREG_3P3_AUX
-WARNLO_in1=3130
-WARNHI_in1=3474
-CRITLO_in1=2974
-CRITHI_in1=3631
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf
deleted file mode 100644
index fc0896b..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_in1=VREG_5P0_USB
-WARNLO_in1=4758
-WARNHI_in1=5258
-CRITLO_in1=4507
-CRITHI_in1=5509
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf
deleted file mode 100644
index 91a38ee..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_in1=PVDDQ_510
-WARNLO_in1=1144
-WARNHI_in1=1264
-CRITLO_in1=1080
-CRITHI_in1=1320
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf
deleted file mode 100644
index d86a588..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_in1=PVDDQ_423
-WARNLO_in1=1144
-WARNHI_in1=1264
-CRITLO_in1=1080
-CRITHI_in1=1320
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf
deleted file mode 100644
index e968f08..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LABEL_temp1=SYS_SOC_TEMP_L
-CRITLO_temp1=0
-CRITHI_temp1=100000
-
-LABEL_temp2=SYS_SOC_TEMP_R
-CRITLO_temp2=0
-CRITHI_temp2=100000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf
deleted file mode 100644
index 6a0bab5..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LABEL_temp1=SYS_INLET_0_L
-CRITLO_temp1=0
-CRITHI_temp1=50000
-
-LABEL_temp2=SYS_INLET_0_R
-CRITLO_temp2=0
-CRITHI_temp2=50000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf
deleted file mode 100644
index b856482..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=SYS_INLET_1
-CRITLO_temp1=0
-CRITHI_temp1=50000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf
deleted file mode 100644
index 2ed024e..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=SYS_INLET_2
-CRITLO_temp1=0
-CRITHI_temp1=50000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf
deleted file mode 100644
index ee3b5d5..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=SYS_INLET_3
-CRITLO_temp1=0
-CRITHI_temp1=50000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf
deleted file mode 100644
index 2805cad..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-LABEL_in1=HSC_AUX_VIN
-WARNLO_in1=11431
-WARNHI_in1=12567
-CRITLO_in1=10792
-CRITHI_in1=13206
-
-LABEL_in2=HSC_AUX_VOUT
-WARNLO_in2=11431
-WARNHI_in2=12567
-CRITLO_in2=10792
-CRITHI_in2=13206
-
-LABEL_curr1=HSC_AUX_IOUT
-WARNLO_curr1=0
-WARNHI_curr1=50058
-CRITLO_curr1=0
-CRITHI_curr1=60021
-
-LABEL_power1=HSC_AUX_PIN
-WARNLO_power1=0
-WARNHI_power1=601520
-CRITLO_power1=0
-CRITHI_power1=721240
-
-LABEL_temp1=HSC_AUX_TEMP
-CRITLO_temp1=0
-CRITHI_temp1=105000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf
deleted file mode 100644
index 3c4ebba..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-LABEL_in1=HSC_HDD_VIN
-WARNLO_in1=11431
-WARNHI_in1=12567
-CRITLO_in1=10792
-CRITHI_in1=13206
-
-LABEL_in2=HSC_HDD_VOUT
-WARNLO_in2=11431
-WARNHI_in2=12567
-CRITLO_in2=10792
-CRITHI_in2=13206
-
-LABEL_curr1=HSC_HDD_IOUT
-WARNLO_curr1=0
-WARNHI_curr1=11993
-CRITLO_curr1=0
-CRITHI_curr1=15008
-
-LABEL_power1=HSC_HDD_PIN
-WARNLO_power1=0
-WARNHI_power1=143200
-CRITLO_power1=0
-CRITHI_power1=179200
-
-LABEL_temp1=HSC_HDD_TEMP
-CRITLO_temp1=0
-CRITHI_temp1=60000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf
deleted file mode 100644
index 01b3210..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-LABEL_in1=HSC_FAN_VIN
-WARNLO_in1=11431
-WARNHI_in1=12567
-CRITLO_in1=10792
-CRITHI_in1=13206
-
-LABEL_in2=HSC_FAN_VOUT
-WARNLO_in2=11431
-WARNHI_in2=12567
-CRITLO_in2=10792
-CRITHI_in2=13206
-
-LABEL_curr1=HSC_FAN_IOUT
-WARNLO_curr1=0
-WARNHI_curr1=24948
-CRITLO_curr1=0
-CRITHI_curr1=29988
-
-LABEL_power1=HSC_FAN_PIN
-WARNLO_power1=0
-WARNHI_power1=298980
-CRITLO_power1=0
-CRITHI_power1=359380
-
-LABEL_temp1=HSC_FAN_TEMP
-CRITLO_temp1=0
-CRITHI_temp1=105000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf
deleted file mode 100644
index 5a6fe7e..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-LABEL_fan1=PSU_FAN
-CRITLO_fan1=535
-CRITHI_fan1=13054
-
-LABEL_temp3=PSU_TEMP_AMB
-CRITLO_temp3=0
-CRITHI_temp3=50000
-
-LABEL_temp1=PSU_TEMP_HS
-CRITLO_temp1=0
-CRITHI_temp1=100000
-
-LABEL_in1=PSU_VIN
-WARNLO_in1=96000
-WARNHI_in1=0
-CRITLO_in1=0
-CRITHI_in1=253000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf
deleted file mode 100644
index 1e21d96..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-LABEL_fan1=SYS_FAN_1_F
-CRITLO_fan1=535
-CRITHI_fan1=26964
-GAIN_fan1=0.85
-OFFSET_fan1=0
-
-LABEL_fan2=SYS_FAN_1_R
-CRITLO_fan2=535
-CRITHI_fan2=26964
-GAIN_fan2=0.8
-OFFSET_fan2=0
-
-LABEL_fan8=SYS_FAN_2_F
-CRITLO_fan8=535
-CRITHI_fan8=26964
-GAIN_fan8=0.85
-OFFSET_fan8=0
-
-LABEL_fan3=SYS_FAN_2_R
-CRITLO_fan3=535
-CRITHI_fan3=26964
-GAIN_fan3=0.8
-OFFSET_fan3=0
-
-LABEL_fan4=SYS_FAN_3_F
-CRITLO_fan4=535
-CRITHI_fan4=26964
-GAIN_fan4=0.85
-OFFSET_fan4=0
-
-LABEL_fan5=SYS_FAN_3_R
-CRITLO_fan5=535
-CRITHI_fan5=26964
-GAIN_fan5=0.8
-OFFSET_fan5=0
-
-LABEL_fan11=SYS_FAN_4_F
-CRITLO_fan11=535
-CRITHI_fan11=26964
-GAIN_fan11=0.85
-OFFSET_fan11=0
-
-LABEL_fan6=SYS_FAN_4_R
-CRITLO_fan6=535
-CRITHI_fan6=26964
-GAIN_fan6=0.8
-OFFSET_fan6=0
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf
deleted file mode 100644
index 20dad4b..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-LABEL_fan1=SYS_FAN_5_F
-CRITLO_fan1=535
-CRITHI_fan1=26964
-GAIN_fan1=0.85
-OFFSET_fan1=0
-
-LABEL_fan2=SYS_FAN_5_R
-CRITLO_fan2=535
-CRITHI_fan2=26964
-GAIN_fan2=0.8
-OFFSET_fan2=0
-
-LABEL_fan8=SYS_FAN_6_F
-CRITLO_fan8=535
-CRITHI_fan8=26964
-GAIN_fan8=0.85
-OFFSET_fan8=0
-
-LABEL_fan3=SYS_FAN_6_R
-CRITLO_fan3=535
-CRITHI_fan3=26964
-GAIN_fan3=0.8
-OFFSET_fan3=0
-
-LABEL_fan4=SYS_FAN_7_F
-CRITLO_fan4=535
-CRITHI_fan4=26964
-GAIN_fan4=0.85
-OFFSET_fan4=0
-
-LABEL_fan5=SYS_FAN_7_R
-CRITLO_fan5=535
-CRITHI_fan5=26964
-GAIN_fan5=0.8
-OFFSET_fan5=0
-
-LABEL_fan11=SYS_FAN_8_F
-CRITLO_fan11=535
-CRITHI_fan11=26964
-GAIN_fan11=0.85
-OFFSET_fan11=0
-
-LABEL_fan6=SYS_FAN_8_R
-CRITLO_fan6=535
-CRITHI_fan6=26964
-GAIN_fan6=0.8
-OFFSET_fan6=0
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf
deleted file mode 100644
index 1c85be9..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LABEL_temp1=FAN_BD_TEMP_L
-CRITLO_temp1=0
-CRITHI_temp1=60000
-
-LABEL_temp2=FAN_BD_TEMP_R
-CRITLO_temp2=0
-CRITHI_temp2=60000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf
deleted file mode 100644
index a7e74da..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=SYS_OUTLET_3
-CRITLO_temp1=0
-CRITHI_temp1=100000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf
deleted file mode 100644
index 0bb21b2..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LABEL_temp1=SYS_OUTLET_0_L
-CRITLO_temp1=0
-CRITHI_temp1=100000
-
-LABEL_temp2=SYS_OUTLET_0_R
-CRITLO_temp2=0
-CRITHI_temp2=100000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf
deleted file mode 100644
index f794c0e..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=SYS_OUTLET_1
-CRITLO_temp1=0
-CRITHI_temp1=100000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf
deleted file mode 100644
index 3834fc2..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=SYS_OUTLET_2
-CRITLO_temp1=0
-CRITHI_temp1=100000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/flash-controller@1e631000/spi2@0.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/flash-controller@1e631000/spi2@0.conf
deleted file mode 100644
index 1311e52..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/flash-controller@1e631000/spi2@0.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-LABEL_temp1=SOC_TEMP
-CRITLO_temp1=0
-CRITHI_temp1=94000
-
-LABEL_temp2=PMF2432_TEMP
-CRITLO_temp2=0
-CRITHI_temp2=103000
-
-LABEL_temp3=PMF2433_TEMP
-CRITLO_temp3=0
-CRITHI_temp3=103000
-
-LABEL_temp4=CVR_APC_TEMP
-CRITLO_temp4=0
-CRITHI_temp4=103000
-
-LABEL_temp5=CVR_CBF_TEMP
-CRITLO_temp5=0
-CRITHI_temp5=103000
-
-LABEL_temp6=DIMM_C0D0_TEMP
-CRITLO_temp6=0
-CRITHI_temp6=83000
-
-LABEL_temp7=DIMM_C0D1_TEMP
-CRITLO_temp7=0
-CRITHI_temp7=83000
-
-LABEL_temp8=DIMM_C1D0_TEMP
-CRITLO_temp8=0
-CRITHI_temp8=83000
-
-LABEL_temp9=DIMM_C1D1_TEMP
-CRITLO_temp9=0
-CRITHI_temp9=83000
-
-LABEL_temp10=DIMM_C2D0_TEMP
-CRITLO_temp10=0
-CRITHI_temp10=83000
-
-LABEL_temp11=DIMM_C2D1_TEMP
-CRITLO_temp11=0
-CRITHI_temp11=83000
-
-LABEL_temp12=DIMM_C3D0_TEMP
-CRITLO_temp12=0
-CRITHI_temp12=83000
-
-LABEL_temp13=DIMM_C3D1_TEMP
-CRITLO_temp13=0
-CRITHI_temp13=83000
-
-LABEL_temp14=DIMM_C4D0_TEMP
-CRITLO_temp14=0
-CRITHI_temp14=83000
-
-LABEL_temp15=DIMM_C4D1_TEMP
-CRITLO_temp15=0
-CRITHI_temp15=83000
-
-LABEL_temp16=DIMM_C5D0_TEMP
-CRITLO_temp16=0
-CRITHI_temp16=83000
-
-LABEL_temp17=DIMM_C5D1_TEMP
-CRITLO_temp17=0
-CRITHI_temp17=83000
-
-LABEL_power1=SOC_PWR
-WARNLO_power1=0
-WARNHI_power1=120000
-CRITLO_power1=0
-CRITHI_power1=130000
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf
deleted file mode 100644
index 86d3396..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-LABEL_in1=SYS_3V3
-GAIN_in1=2.40
-WARNLO_in1=3132
-WARNHI_in1=3463
-CRITLO_in1=2975
-CRITHI_in1=3637
-LABEL_in2=SYS_5V0
-GAIN_in2=3.86
-WARNLO_in2=4744
-WARNHI_in2=5253
-CRITLO_in2=4502
-CRITHI_in2=5494
-LABEL_in3=SYS_12V0
-GAIN_in3=8.82
-WARNLO_in3=11408
-WARNHI_in3=12586
-CRITLO_in3=10850
-CRITHI_in3=13206
-LABEL_in6=SYS_3V3_AUX
-GAIN_in6=2.40
-WARNLO_in6=3132
-WARNHI_in6=3463
-CRITLO_in6=2975
-CRITHI_in6=3637
-LABEL_in8=SYS_3V0_Battery
-GAIN_in8=1.66
-WARNLO_in8=2849
-WARNHI_in8=3460
-CRITLO_in8=2701
-CRITHI_in8=3629
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/files/socupdate.sh b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/files/socupdate.sh
deleted file mode 100644
index 67d7063..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/files/socupdate.sh
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/bin/sh -e
-# SOC update tool, need two parameter(soc update file name and TFTP ip)
-
-if [ ! -n "$1" -o ! -n "$2" ] ;then
-    echo "Please enter SOC-ImageName and TFTP-IP."
-    echo "Format: socupdate.sh FileName IP"
-    echo "Example: socupdate.sh 0ACJAXXX.ROM 192.168.1.1"
-    exit
-fi
-
-echo "SOC update start."
-
-echo "Check BMC status."
-checkbmc='gpioutil -p Q4'
-if $checkbmc = "1"; then
-    echo "BMC is ready."
-else
-    echo "BMC isn't ready."
-    exit
-fi
-
-echo "Check SOC image does it exist."
-cd /tmp/
-FILEEXIST=0
-if [ -f "/tmp/$1" ]; then
-    GETFILE=`du -k $1 | awk '{print $1}'`
-    if [ "$GETFILE" -eq "65536" ]; then
-        FILEEXIST=1
-        echo "SOC image is exist."
-    else
-        FILEEXIST=0
-    fi
-fi
-
-if [ $FILEEXIST -eq 0 ]; then
-    echo "Get SOC image from TFTP server."
-    echo "Please wait a few minutes."
-    tftp -g -r $1 $2 &
-    sleep 2
-    LENGTH=0
-    ERRCOUNT=0
-    while true
-    do
-        echo -ne "\r["
-        usleep 500000
-        while [ $LENGTH -le 30 ]
-        do
-                usleep 500000
-                echo -n ">"
-                LENGTH=$(($LENGTH+1))
-                if [ -f "/tmp/$1" ]; then
-                    GETFILE=`du -k $1 | awk '{print $1}'`
-                    if [ $GETFILE -eq 65536 ]; then
-                        echo -en "\r"
-                        echo -en "--- Image download completed --- \n"
-                        usleep 1000000
-                        break 2
-                    fi
-                else
-                    ERRCOUNT=$(($ERRCOUNT+1))
-                    if [ $ERRCOUNT -le 10 ]; then
-                        echo -en "\r"
-                        echo -en "SOC-ImageName or TFTP-IP is ERROR. \n"
-                        usleep 500000
-                        exit
-                    fi
-                fi
-        done
-        echo -n "]"
-        LENGTH=0
-        usleep 500000
-        echo -en "\r                                "
-    done
-fi
-sleep 3
-
-echo "Switch the host SPI bus to BMC."
-cmd='gpioutil -p C7 -v 1'
-if $cmd 1>/dev/null 2>&1; then
-    echo "Switch completed."
-else
-    echo "Switch failed."
-fi
-echo "Load the ASpeed SMC driver"
-echo 1e630000.flash-controller > /sys/bus/platform/drivers/aspeed-smc/bind
-sleep 2
-chassisstate=$(obmcutil chassisstate | awk -F. '{print $NF}')
-echo "---Current Chassisstate $chassisstate---"
-if [ "$chassisstate" == 'On' ];
-then
-    echo "---Chassis on turning it off---"
-    obmcutil chassisoff
-    sleep 10
-fi
-
-echo "Flashcp to update SOC."
-echo "Please wait a few minutes."
-flashcp -v /tmp/$1 /dev/mtd6
-sleep 3
-
-echo "Switch the host SPI bus to HOST."
-cmd1='gpioutil -p C7 -v 0'
-if $cmd1 1>/dev/null 2>&1; then
-    echo "Switch completed."
-else
-    echo "Switch failed."
-fi
-echo "unLoad the ASpeed SMC driver"
-echo 1e630000.flash-controller > /sys/bus/platform/drivers/aspeed-smc/unbind
-echo -ne "SOC update steps is complete.\n"
-if [ "$chassisstate" == 'On' ];
-then
-	echo "5 sec later will be power-on."
-	echo "If wantn't power-on, please CTRL + C leave script."
-	WAITSEC=5
-	while [ $WAITSEC -ge 0 ]
-	do
-        echo -n "Countdown seconds:$WAITSEC"
-        sleep 1
-        echo -en "\r"
-        WAITSEC=$(($WAITSEC-1))
-        if [ $WAITSEC -eq 0 ]; then
-            echo -en "\r"
-            echo -en "--- Power-on ---       \n"
-            obmcutil chassison
-            break 1
-        fi
-	done
-fi
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/socupdate.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/socupdate.bb
deleted file mode 100644
index 45f69d3..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/socupdate.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "Qualcomm SOC update"
-DESCRIPTION = ""
-HOMEPAGE = ""
-PR = "r1"
-
-inherit obmc-phosphor-license
-
-SRC_URI += "file://socupdate.sh"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/socupdate.sh ${D}${bindir}/socupdate.sh
-}
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/workbook/centriq2400-rep-config.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/workbook/centriq2400-rep-config.bb
deleted file mode 100644
index 8fbb22f..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/workbook/centriq2400-rep-config.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY = "Qualcomm Rep board wiring"
-DESCRIPTION = "Board wiring information for the Qualcomm Rep system."
-PR = "r1"
-
-inherit allarch
-inherit setuptools
-inherit pythonnative
-inherit obmc-phosphor-license
-
-PROVIDES += "virtual/obmc-inventory-data"
-RPROVIDES_${PN} += "virtual-obmc-inventory-data"
-
-DEPENDS += "python"
-
-S = "${WORKDIR}"
-SRC_URI += "file://Centriq2400-rep.py"
-
-python() {
-        machine = d.getVar('MACHINE', True).capitalize() + '.py'
-        d.setVar('_config_in_skeleton', machine)
-}
-
-do_make_setup() {
-        cp ${S}/${_config_in_skeleton} \
-                ${S}/obmc_system_config.py
-        cat <<EOF > ${S}/setup.py
-from distutils.core import setup
-
-setup(name='${BPN}',
-    version='${PR}',
-    py_modules=['obmc_system_config'],
-    )
-EOF
-}
-
-addtask make_setup after do_patch before do_configure
-
diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/workbook/centriq2400-rep-config/Centriq2400-rep.py b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/workbook/centriq2400-rep-config/Centriq2400-rep.py
deleted file mode 100644
index 01cff57..0000000
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/workbook/centriq2400-rep-config/Centriq2400-rep.py
+++ /dev/null
@@ -1,81 +0,0 @@
-## System states
-##   state can change to next state in 2 ways:
-##   - a process emits a GotoSystemState signal with state name to goto
-##   - objects specified in EXIT_STATE_DEPEND have started
-SYSTEM_STATES = [
-    'BASE_APPS',
-    'BMC_STARTING',
-    'BMC_READY',
-    'HOST_POWERING_ON',
-    'HOST_POWERED_ON',
-    'HOST_BOOTING',
-    'HOST_BOOTED',
-    'HOST_POWERED_OFF',
-]
-
-EXIT_STATE_DEPEND = {
-    'BASE_APPS' : {
-        '/org/openbmc/sensors': 0,
-    },
-    'BMC_STARTING' : {
-        '/org/openbmc/control/power0' : 0,
-        '/org/openbmc/control/host0' : 0,
-        '/org/openbmc/control/chassis0' : 0,
-    },
-}
-
-FRU_INSTANCES = {
-'<inventory_root>/system/chassis/motherboard/bmc' : { 'fru_type' : 'BMC','is_fru' : False, 'manufacturer' : 'ASPEED' },
-}
-# I believe these numbers need to match the yaml file used to create the c++ ipmi map.
-# the devices have types, but I don't believe that factors in here, I think these are
-# just unique IDs.
-ID_LOOKUP = {
-    'FRU' : {},
-    # The number at the end needs to match the FRU ID.
-    # https://github.com/openbmc/skeleton/blob/master/pysystemmgr/system_manager.py#L143
-    # The paramter for it is of type 'y' (unsigned 8-bit integer) presumably decimal?
-    'FRU_STR' : {},
-    'SENSOR' : {},
-    'GPIO_PRESENT' : {}
-}
-
-GPIO_CONFIG = {}
-GPIO_CONFIG['POWER_BUTTON'] = { 'gpio_pin': 'D3', 'direction': 'out' }
-GPIO_CONFIG['PGOOD'] = { 'gpio_pin': 'E2', 'direction': 'in' }
-GPIO_CONFIG['BMC_READY'] = { 'gpio_pin': 'Q4', 'direction': 'out' }
-GPIO_CONFIG['HOST_SPI_SWITCH'] = { 'gpio_pin': 'C7', 'direction': 'out'}
-GPIO_CONFIG['IMC_READY'] = { 'gpio_pin': 'O3', 'direction': 'both' }
-GPIO_CONFIG['IMC_INTERRUPT'] = { 'gpio_pin': 'O4', 'direction': 'both' }
-GPIO_CONFIG['RESET_BUTTON'] = { 'gpio_pin': 'G5', 'direction': 'both' }
-GPIO_CONFIG['QDF_RAS_ERROR_0'] = { 'gpio_pin': 'D6', 'direction': 'in' }
-GPIO_CONFIG['QDF_RAS_ERROR_1'] = { 'gpio_pin': 'D7', 'direction': 'in' }
-GPIO_CONFIG['QDF_RAS_ERROR_2'] = { 'gpio_pin': 'F1', 'direction': 'in' }
-
-GPIO_CONFIGS = {
-        'power_config' : {
-        'power_good_in' : 'PGOOD',
-        'power_up' : [
-#delay in ms
-            ('POWER_BUTTON', 'LOW_HIGH',1000),
-        ],
-        'power_out' : [
-            ('POWER_BUTTON', 'LOW_HIGH',8000),
-        ],
-    }}
-        'host_config' : {
-        'imc_ready' : 'IMC_READY',
-        'imc_interrupt': 'IMC_INTERRUPT',
-        'bmc_ready' : 'BMC_READY',
-        'host_spi_switch' : 'HOST_SPI_SWITCH',
-    },
-}
-
-# Miscellaneous non-poll sensor with system specific properties.
-# The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
-
-MISC_SENSORS = {
-
-}
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4