diff --git a/common/recipes-phosphor/fsi/op-fsi.bb b/common/recipes-phosphor/fsi/op-fsi.bb
index 5cb0053..840b649 100644
--- a/common/recipes-phosphor/fsi/op-fsi.bb
+++ b/common/recipes-phosphor/fsi/op-fsi.bb
@@ -13,11 +13,6 @@
 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_SERVICE_${PN} += "${TMPL_SCAN} 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/fsi/op-fsi/fsi-bind@.service b/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
deleted file mode 100644
index 3e85648..0000000
--- a/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
+++ /dev/null
@@ -1,19 +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-chassis-poweroff@%i.target
-ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/fsi-master
-ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/gpio-fsi
-
-[Service]
-ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/bind || echo gpio-fsi > /sys/bus/platform/drivers/fsi-master-gpio/bind"
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-RequiredBy=obmc-chassis-poweron@%i.target