diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service
deleted file mode 100644
index f8c9135..0000000
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Clean up UBI volumes unattached to a BMC version after DeleteAll
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStartPre=/usr/bin/env obmc-flash-bmc createenvbackup
-ExecStart=/usr/bin/env obmc-flash-bmc ubicleanup
-SyslogIdentifier=obmc-flash-bmc
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-mirroruboot.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-mirroruboot.service
deleted file mode 100644
index 361dd61..0000000
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-mirroruboot.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Copy uboot from the currently booted bmc chip to the alternate chip
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/usr/bin/env obmc-flash-bmc mirroruboot
-SyslogIdentifier=obmc-flash-bmc
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service
deleted file mode 100644
index 388bb1a..0000000
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Remount the ubi volume after a reboot
-Wants=xyz.openbmc_project.Software.BMC.Updater.service
-Before=xyz.openbmc_project.Software.BMC.Updater.service
-Wants=obmc-flash-bmc-setenv@rwreset.service
-After=obmc-flash-bmc-setenv@rwreset.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/usr/bin/env obmc-flash-bmc ubiremount
-SyslogIdentifier=obmc-flash-bmc
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
deleted file mode 100644
index 42aa026..0000000
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Deletes read-only and kernel ubi volume %I
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/usr/bin/env obmc-flash-bmc ubiremove rofs-%i
-ExecStart=/usr/bin/env obmc-flash-bmc ubiremove kernel-%i
-SyslogIdentifier=obmc-flash-bmc
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
deleted file mode 100644
index 5cd8565..0000000
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Store read-only images %I to BMC storage
-OnFailure=obmc-flash-bmc-ubiro-remove@%i.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStartPre=/usr/bin/env obmc-flash-bmc createenvbackup
-ExecStart=/usr/bin/env obmc-flash-bmc ubiro {RO_MTD} rofs-%i %i
-ExecStart=/usr/bin/env obmc-flash-bmc ubikernel {KERNEL_MTD} kernel-%i %i
-ExecStart=/usr/bin/env obmc-flash-bmc mtduboot u-boot %i
-SyslogIdentifier=obmc-flash-bmc
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
deleted file mode 100644
index 68c4ab2..0000000
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Deletes BMC read-write ubi volume
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/usr/bin/env obmc-flash-bmc ubiremove rwfs
-SyslogIdentifier=obmc-flash-bmc
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service
deleted file mode 100644
index 79d0ea3..0000000
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Create BMC read-write ubi volume
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/usr/bin/env obmc-flash-bmc ubirw {RW_MTD} rwfs {RW_SIZE}
-SyslogIdentifier=obmc-flash-bmc
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service
deleted file mode 100644
index bab0b02..0000000
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description= Updates the u-boot variable to point BMC version to %I
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/usr/bin/env obmc-flash-bmc updateubootvars %i
-SyslogIdentifier=obmc-flash-bmc
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-disable.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-disable.service
deleted file mode 100644
index b09df99..0000000
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-disable.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Removes the guard that blocks BMC reboot
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/usr/bin/env obmc-flash-bmc rebootguarddisable
-SyslogIdentifier=obmc-flash-bmc
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-enable.service b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-enable.service
deleted file mode 100644
index 4405e3d..0000000
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-enable.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Enable a guard that blocks BMC reboot
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/usr/bin/env obmc-flash-bmc rebootguardenable
-SyslogIdentifier=obmc-flash-bmc
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/usr-local.mount b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/usr-local.mount
deleted file mode 100644
index 7aa2cf6..0000000
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager/usr-local.mount
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=/usr/local
-
-[Mount]
-What=tmpfs
-Where=/usr/local
-Type=tmpfs