diff --git a/README.md b/README.md
index 543f0c9..acd1884 100644
--- a/README.md
+++ b/README.md
@@ -54,21 +54,25 @@
 $ . setup <machine> [build_dir]
 Target machine must be specified. Use one of:
 
-bletchley               mori                    s8036
-dl360poc                mtjade                  swift
+ahe50dc                 harma                   s7106
+bletchley               kudo                    s8036
+daytonax                lannister               sbp1
+dl360-g11               minerva                 spc621d8hm3
+dl360poc                mori                    starscream
+dl385-g11               mtjade                  system1
 e3c246d4i               mtmitchell              tatlin-archive-x86
-ethanolx                nicole                  tiogapass
-evb-ast2500             olympus-nuvoton         transformers
-evb-ast2600             on5263m5                vegman-n110
-evb-npcm750             p10bmc                  vegman-rx20
-f0b                     palmetto                vegman-sx20
-fp5280g2                qcom-dc-scm-v1          witherspoon
-g220a                   quanta-q71l             witherspoon-tacoma
-gbs                     romed8hm3               x11spi
-greatlakes              romulus                 yosemitev2
-gsj                     s2600wf                 zaius
-kudo                    s6q
-lannister               s7106
+e3c256d4i               ncplite                 tiogapass
+ethanolx                nicole                  transformers
+evb-ast2500             olympus-nuvoton         vegman-n110
+evb-ast2600             p10bmc                  vegman-rx20
+evb-npcm750             palmetto                vegman-sx20
+evb-npcm845             qcom-dc-scm-v1          witherspoon
+f0b                     quanta-q71l             witherspoon-tacoma
+fp5280g3                rl300-g11               x11spi
+g220a                   romed8hm3               yosemite4
+gbs                     romulus                 yosemitev2
+genesis3                s2600wf                 zaius
+greatlakes              s6q
 ```
 
 Once you know the target (e.g. romulus), source the `setup` script as follows:
diff --git a/meta-ibm/README.md b/meta-ibm/README.md
index ab6aba6..2655dcc 100644
--- a/meta-ibm/README.md
+++ b/meta-ibm/README.md
@@ -32,7 +32,7 @@
 [here](https://www.ibm.com/us-en/marketplace/power-systems-ac922).
 
 In addition to witherspoon, this layer contains additional machine
-configurations such as swift. The default machine target is witherspoon,
+configurations such as p10bmc. The default machine target is witherspoon,
 so in order to build a different configuration, or to build witherspoon
 after building a different one, set the MACHINE environment to the desired
 configuration name (see the conf/machine/ subdirectory for available options):
@@ -45,7 +45,7 @@
 
 Example:
 
-    export MACHINE=swift
+    export MACHINE=p10bmc
     bitbake obmc-phosphor-image
     bitbake phosphor-logging
 
diff --git a/meta-ibm/conf/machine/swift.conf b/meta-ibm/conf/machine/swift.conf
deleted file mode 100644
index 8290a44..0000000
--- a/meta-ibm/conf/machine/swift.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-require conf/machine/witherspoon.conf
-
-IMAGE_FSTYPES += "ext4 mmc-ext4-tar"
-
-KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-opp-${MACHINE}.dtb"
-
-PHOSPHOR_MRW_LICENSE = "Apache-2.0"
-PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-PHOSPHOR_MRW_URI = "git://git@github.com/open-power/swift-xml;protocol=ssh;branch=master;protocol=https"
-PHOSPHOR_MRW_REV = "2b59e12db44e167a1652777b770674d235ec55ba"
-
-# 128MB flash size
-FLASH_SIZE = "131072"
-
-# 32MB read-write filesystem
-FLASH_UBI_RWFS_SIZE ?= "32768"
-FLASH_UBI_RWFS_TXT_SIZE ?= "32MiB"
-BMC_RW_SIZE = "0x2000000"
-
-# Inhibit swift-led-manager-config-native
-PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native:df-mrw = \
-    "swift-led-manager-config-native"
diff --git a/meta-ibm/conf/templates/default/conf-notes.txt b/meta-ibm/conf/templates/default/conf-notes.txt
index de04a8d..d781b4f 100644
--- a/meta-ibm/conf/templates/default/conf-notes.txt
+++ b/meta-ibm/conf/templates/default/conf-notes.txt
@@ -2,8 +2,6 @@
 
 p10bmc:
 MACHINE=p10bmc bitbake obmc-phosphor-image
-swift:
-MACHINE=swift bitbake obmc-phosphor-image
 witherspoon:
 MACHINE=witherspoon bitbake obmc-phosphor-image
 witherspoon-tacoma:
diff --git a/meta-ibm/conf/templates/default/local.conf.sample b/meta-ibm/conf/templates/default/local.conf.sample
index eeaa076..811b7a1 100644
--- a/meta-ibm/conf/templates/default/local.conf.sample
+++ b/meta-ibm/conf/templates/default/local.conf.sample
@@ -1,5 +1,4 @@
 #MACHINE ?= "p10bmc"
-#MACHINE ?= "swift"
 MACHINE ??= "witherspoon"
 DISTRO ?= "openbmc-openpower"
 PACKAGE_CLASSES ?= "package_ipk"
diff --git a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
index e510d78..864cf0e 100644
--- a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
+++ b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
@@ -28,11 +28,6 @@
         printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory
 }
 
-do_install:append:swift() {
-        DEST=${D}${inventory_envdir}
-        printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a340.i2c-bus/i2c-8/8-0051/eeprom" >> ${DEST}/inventory
-}
-
 do_install:append:witherspoon-tacoma() {
         DEST=${D}${inventory_envdir}
         printf "FRUS=BMC,ETHERNET" > ${DEST}/inventory
diff --git a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb
index 452f5ce..76bd6d9 100644
--- a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb
+++ b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb
@@ -12,18 +12,12 @@
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
 SRC_URI:append:witherspoon = " file://power-workarounds.sh"
-SRC_URI:append:swift = " file://power-workarounds.sh"
 
 do_install:append:witherspoon() {
         install -d ${D}${bindir}
         install -m 0755 ${S}/power-workarounds.sh ${D}${bindir}/power-workarounds.sh
 }
 
-do_install:append:swift() {
-        install -d ${D}${bindir}
-        install -m 0755 ${S}/power-workarounds.sh ${D}${bindir}/power-workarounds.sh
-}
-
 TMPL_WA = "power-workarounds@.service"
 INSTFMT_WA = "power-workarounds@{0}.service"
 TGTFMT = "obmc-chassis-poweron@{0}.target"
@@ -31,6 +25,3 @@
 
 SYSTEMD_SERVICE:${PN}:append:witherspoon = " ${TMPL_WA}"
 SYSTEMD_LINK:${PN}:append:witherspoon = "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}"
-
-SYSTEMD_SERVICE:${PN}:append:swift = " ${TMPL_WA}"
-SYSTEMD_LINK:${PN}:append:swift = "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-ibm/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds.sh b/meta-ibm/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds.sh
deleted file mode 100644
index dc1f480..0000000
--- a/meta-ibm/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# This should be run before power-on and used to patch/update power specific
-# hardware settings. This is platform specific settings that must be
-# updated/removed if not Swift.
-
-########## Program TPS53915 FSW to desired frequency #########
-# FREQUENCY_CONFIG D3h, bits 2:0
-
-# AVDD, bus 3 addr 1D, set to 600khz
-# 600khz = 1,0,0
-i2cset -y 3 0x1D 0xD3 0x04 b
-
-# 3.3VA, bus 3 addr 1C, set to 600khz
-i2cset -y 3 0x1C 0xD3 0x04 b
-
-# 3.3VB, bus 3 addr 1B, set to 600khz
-i2cset -y 3 0x1B 0xD3 0x04 b
-
-# 5.0V, bus 3 addr 1A, set to 850khz
-# 850khz = 1,1,0
-i2cset -y 3 0x1A 0xD3 0x06 b
-########## END Program TPS53915 FSW to desired frequency #########
-
diff --git a/meta-ibm/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds@.service b/meta-ibm/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds@.service
deleted file mode 100644
index 0926e03..0000000
--- a/meta-ibm/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Perform power workarounds on VRMs after PGOOD is up
-Wants=obmc-power-on@%i.target
-After=obmc-power-on@%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/power-workarounds.sh
-SyslogIdentifier=power-workarounds.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 481e622..a7f2ea4 100644
--- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -39,7 +39,6 @@
 RDEPENDS:${PN}-extras:append:witherspoon-tacoma = " pldm srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg debug-trigger libmctp"
 RDEPENDS:${PN}-extras:remove:witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller"
 RDEPENDS:${PN}-extras:append:sbp1 = " phosphor-ipmi-ipmb "
-RDEPENDS:${PN}-extras:remove:swift = "obmc-ikvm"
 
 RDEPENDS:${PN}-software:append:ibm-ac-server = " phosphor-software-manager-sync"
 RDEPENDS:${PN}-software:append:p10bmc = " phosphor-software-manager-usb"
diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
index 0e87f71..e06c1fb 100644
--- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
+++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
@@ -12,7 +12,6 @@
 DEPENDS:append:p10bmc = " power-sequencer"
 
 PACKAGECONFIG:append:ibm-ac-server = " monitor"
-PACKAGECONFIG:append:swift = " monitor"
 PACKAGECONFIG:append:p10bmc = " monitor-ng"
 PACKAGECONFIG:append:system1 = " monitor-ng"
 
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index e77ff9b..ebde557 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -16,22 +16,6 @@
                bus@1e78a000/i2c-bus@180/ir35221@71 \
                bus@1e78a000/i2c-bus@380/tmp275@4a \
                "
-CHIPS:swift = " \
-               bus@1e78a000/i2c-bus@100/max31785@52 \
-               bus@1e78a000/i2c-bus@100/power-supply@68 \
-               bus@1e78a000/i2c-bus@100/power-supply@69 \
-               bus@1e78a000/i2c-bus@440/tmp275@4a \
-               bus@1e78a000/i2c-bus@440/tmp275@48 \
-               bus@1e78a000/i2c-bus@300/tmp275@48 \
-               bus@1e78a000/i2c-bus@300/dps310@76 \
-               bus@1e78a000/i2c-bus@300/si7021a20@20 \
-               bus@1e78a000/i2c-bus@380/ir35219@70 \
-               bus@1e78a000/i2c-bus@380/ir35221@71 \
-               bus@1e78a000/i2c-bus@380/ir35221@72 \
-               bus@1e78a000/i2c-bus@3c0/ir35219@70 \
-               bus@1e78a000/i2c-bus@3c0/ir35221@71 \
-               bus@1e78a000/i2c-bus@3c0/ir35221@72 \
-               "
 
 CHIPS:witherspoon-tacoma = " \
                bus@1e78a000/i2c-bus@200/max31785@52 \