diff --git a/common/recipes-phosphor/flash/obmc-flash-bios.bb b/common/recipes-phosphor/flash/obmc-flash-bios.bb
index 2137de4..c425027 100644
--- a/common/recipes-phosphor/flash/obmc-flash-bios.bb
+++ b/common/recipes-phosphor/flash/obmc-flash-bios.bb
@@ -7,11 +7,6 @@
 inherit skeleton-gdbus
 inherit obmc-phosphor-dbus-service
 
-RDEPENDS_${PN} += "mtd-utils-ubifs"
-
 SKELETON_DIR = "flashbios"
 DBUS_SERVICE_${PN} += "org.openbmc.control.Flash.service"
 SYSTEMD_SERVICE_${PN} += "obmc-flash-init.service"
-SYSTEMD_SERVICE_${PN} += "obmc-flash-bios-ubiattach.service"
-SYSTEMD_SERVICE_${PN} += "obmc-flash-bios-ubimount@.service"
-SYSTEMD_SERVICE_${PN} += "obmc-flash-bios-squashfsmount@.service"
diff --git a/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-squashfsmount@.service b/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-squashfsmount@.service
deleted file mode 100644
index 1bf15bf..0000000
--- a/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-squashfsmount@.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Mount SquashFS image pnor-ro-%I
-Requires=obmc-flash-bios-ubiattach.service
-After=obmc-flash-bios-ubiattach.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/sh -c '{sbindir}/ubimkvol /dev/ubi0 -N pnor-ro-%i -s 32MiB --type=static; \
-                      mkdir /media/pnor-ro-%i; \
-                      volumeid%i=`ubinfo -d 0 -N pnor-ro-%i | grep "Volume ID" | sed -e "s|Volume ID:||" -e "s/^ *//" | grep -o "^\S*"`; \
-                      ubiblock --create /dev/ubi0_$volumeid%i; \
-                      ubiupdatevol /dev/ubi0_$volumeid%i /tmp/images/%i/pnor.xz.squashfs; \
-                      mount -t squashfs -o ro /dev/ubiblock0_$volumeid%i /media/pnor-ro-%i'
diff --git a/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubiattach.service b/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubiattach.service
deleted file mode 100644
index 90013ff..0000000
--- a/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubiattach.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Attach the PNOR mtd device to UBI
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/sh -c 'grep pnor /proc/mtd |cut -c 4 |xargs {sbindir}/ubiattach /dev/ubi_ctrl -m'
-ExecStop=/bin/sh -c 'grep pnor /proc/mtd |cut -c 4 |xargs {sbindir}/ubidetach /dev/ubi_ctrl -m'
diff --git a/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubimount@.service b/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubimount@.service
deleted file mode 100644
index 5abab7f..0000000
--- a/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubimount@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Mount UBIFS volume pnor-rw-%I
-Requires=obmc-flash-bios-ubiattach.service
-After=obmc-flash-bios-ubiattach.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/sh -c '{sbindir}/ubimkvol /dev/ubi0 -N pnor-rw-%i -s 1MiB; \
-                      mkdir /media/pnor-rw-%i; \
-                      mount -t ubifs ubi0:pnor-rw-%i /media/pnor-rw-%i'