diff --git a/ibmvstgt/src/scsi_host.h b/ibmvstgt/src/scsi_host.h
index 3a86baa3b..f51a42e6d 100644
--- a/ibmvstgt/src/scsi_host.h
+++ b/ibmvstgt/src/scsi_host.h
@@ -38,7 +38,6 @@ struct blk_queue_tags;
 
 #define MODE_UNKNOWN 0x00
 #define MODE_INITIATOR 0x01
-#define MODE_TARGET 0x02
 
 #define DISABLE_CLUSTERING 0
 #define ENABLE_CLUSTERING 1
diff --git a/ibmvstgt/src/scsi_sysfs.c b/ibmvstgt/src/scsi_sysfs.c
index c23ab978c..307fef820 100644
--- a/ibmvstgt/src/scsi_sysfs.c
+++ b/ibmvstgt/src/scsi_sysfs.c
@@ -207,9 +207,6 @@ show_shost_mode(unsigned int mode, char *buf)
 	if (mode & MODE_INITIATOR)
 		len = sprintf(buf, "%s", "Initiator");
 
-	if (mode & MODE_TARGET)
-		len += sprintf(buf + len, "%s%s", len ? ", " : "", "Target");
-
 	len += sprintf(buf + len, "\n");
 
 	return len;
diff --git a/ibmvstgt/src/scsi_transport_fc.c b/ibmvstgt/src/scsi_transport_fc.c
index 068137891..4b73fb522 100644
--- a/ibmvstgt/src/scsi_transport_fc.c
+++ b/ibmvstgt/src/scsi_transport_fc.c
@@ -2908,10 +2908,6 @@ fc_remote_port_delete(struct fc_rport  *rport)
 
 	spin_unlock_irqrestore(shost->host_lock, flags);
 
-	if (rport->roles & FC_PORT_ROLE_FCP_INITIATOR &&
-	    shost->active_mode & MODE_TARGET)
-		fc_tgt_it_nexus_destroy(shost, (unsigned long)rport);
-
 	scsi_target_block(&rport->dev);
 
 	/* see if we need to kill io faster than waiting for device loss */
@@ -2961,12 +2957,6 @@ fc_remote_port_rolechg(struct fc_rport  *rport, u32 roles)
 			create = 1;
 		} else if (!(rport->roles & FC_PORT_ROLE_FCP_TARGET))
 			create = 1;
-	} else if (shost->active_mode & MODE_TARGET) {
-		ret = fc_tgt_it_nexus_create(shost, (unsigned long)rport,
-					     (char *)&rport->node_name);
-		if (ret)
-			printk(KERN_ERR "FC Remore Port tgt nexus failed %d\n",
-			       ret);
 	}
 
 	rport->roles = roles;
diff --git a/ibmvstgt/src/scsi_transport_srp.c b/ibmvstgt/src/scsi_transport_srp.c
index 21a045e05..d7a882854 100644
--- a/ibmvstgt/src/scsi_transport_srp.c
+++ b/ibmvstgt/src/scsi_transport_srp.c
@@ -223,18 +223,6 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
 		return ERR_PTR(ret);
 	}
 
-	if (shost->active_mode & MODE_TARGET &&
-	    ids->roles == SRP_RPORT_ROLE_INITIATOR) {
-		ret = srp_tgt_it_nexus_create(shost, (unsigned long)rport,
-					      rport->port_id);
-		if (ret) {
-			device_del(&rport->dev);
-			transport_destroy_device(&rport->dev);
-			put_device(&rport->dev);
-			return ERR_PTR(ret);
-		}
-	}
-
 	transport_add_device(&rport->dev);
 	transport_configure_device(&rport->dev);
 
@@ -253,10 +241,6 @@ void srp_rport_del(struct srp_rport *rport)
 	struct device *dev = &rport->dev;
 	struct Scsi_Host *shost = dev_to_shost(dev->parent);
 
-	if (shost->active_mode & MODE_TARGET &&
-	    rport->roles == SRP_RPORT_ROLE_INITIATOR)
-		srp_tgt_it_nexus_destroy(shost, (unsigned long)rport);
-
 	transport_remove_device(dev);
 	device_del(dev);
 	transport_destroy_device(dev);