diff --git a/common/recipes-phosphor/chassis/obmc-fsi.bb b/common/recipes-phosphor/chassis/obmc-fsi.bb
deleted file mode 100644
index 37a326f..0000000
--- a/common/recipes-phosphor/chassis/obmc-fsi.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "FSI Services"
-DESCRIPTION = "Install FSI related services"
-PR = "r1"
-
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
-
-TGTFMT = "obmc-power-chassis-on@{0}.target"
-
-TMPL_SCAN = "fsi-scan@.service"
-INSTFMT_SCAN = "fsi-scan@{0}.service"
-FMT_SCAN = "../${TMPL_SCAN}:${TGTFMT}.requires/${INSTFMT_SCAN}"
-
-TMPL_BIND = "fsi-bind@.service"
-INSTFMT_BIND = "fsi-bind@{0}.service"
-FMT_BIND = "../${TMPL_BIND}:${TGTFMT}.requires/${INSTFMT_BIND}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL_SCAN} ${TMPL_BIND} fsi-enable.service fsi-disable.service"
-
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_BIND', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/common/recipes-phosphor/chassis/obmc-fsi/fsi-bind@.service b/common/recipes-phosphor/chassis/obmc-fsi/fsi-bind@.service
deleted file mode 100644
index 77c61f4..0000000
--- a/common/recipes-phosphor/chassis/obmc-fsi/fsi-bind@.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Bind FSI Driver
-Wants=obmc-power-on@%i.target
-After=obmc-power-on@%i.target
-Wants=obmc-host-start-pre@%i.target
-Before=obmc-host-start-pre@%i.target
-Wants=fsi-scan@%i.service
-Before=fsi-scan@%i.service
-Conflicts=obmc-power-chassis-off@%i.target
-ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/fsi-master
-
-[Service]
-ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/bind"
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-RequiredBy=obmc-power-chassis-on@%i.target
diff --git a/common/recipes-phosphor/chassis/obmc-fsi/fsi-disable.service b/common/recipes-phosphor/chassis/obmc-fsi/fsi-disable.service
deleted file mode 100644
index a58af04..0000000
--- a/common/recipes-phosphor/chassis/obmc-fsi/fsi-disable.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Disable FSI
-Conflicts=fsi-enable.service
-
-[Service]
-ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/unbind"
-Type=oneshot
-RemainAfterExit=yes
diff --git a/common/recipes-phosphor/chassis/obmc-fsi/fsi-enable.service b/common/recipes-phosphor/chassis/obmc-fsi/fsi-enable.service
deleted file mode 100644
index c5b1ea1..0000000
--- a/common/recipes-phosphor/chassis/obmc-fsi/fsi-enable.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Enable FSI
-Conflicts=fsi-disable.service
-ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/fsi-master
-
-[Service]
-ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/bind"
-ExecStart=/bin/sh -c "echo 1 > /sys/bus/platform/devices/fsi-master/scan"
-Type=oneshot
-RemainAfterExit=yes
diff --git a/common/recipes-phosphor/chassis/obmc-fsi/fsi-scan@.service b/common/recipes-phosphor/chassis/obmc-fsi/fsi-scan@.service
deleted file mode 100644
index 8f94e28..0000000
--- a/common/recipes-phosphor/chassis/obmc-fsi/fsi-scan@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Scan FSI devices
-Wants=obmc-power-on@%i.target
-After=obmc-power-on@%i.target
-Wants=obmc-host-start-pre@%i.target
-Before=obmc-host-start-pre@%i.target
-Conflicts=obmc-power-chassis-off@%i.target
-
-[Service]
-ExecStart=/bin/sh -c "echo 1 > /sys/bus/platform/devices/fsi-master/scan"
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-RequiredBy=obmc-power-chassis-on@%i.target