diff --git a/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh b/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh
index 94137507f..4d60cb2ae 100755
--- a/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh
+++ b/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh
@@ -14,8 +14,6 @@ rpc_py="$rootdir/scripts/rpc.py"
 
 timing_enter start_iscsi_tgt
 
-# Start the iSCSI target without using stub
-# Reason: Two SPDK processes will be started
 $ISCSI_APP -m 0x2 -p 1 -s 512 --wait-for-rpc &
 pid=$!
 echo "iSCSI target launched. pid: $pid"
diff --git a/test/iscsi_tgt/initiator/initiator.sh b/test/iscsi_tgt/initiator/initiator.sh
index 8f3104a4c..7ab95415a 100755
--- a/test/iscsi_tgt/initiator/initiator.sh
+++ b/test/iscsi_tgt/initiator/initiator.sh
@@ -14,8 +14,6 @@ rpc_py="$rootdir/scripts/rpc.py"
 
 timing_enter start_iscsi_tgt
 
-# Start the iSCSI target without using stub
-# Reason: Two SPDK processes will be started
 $ISCSI_APP -m 0x2 -p 1 -s 512 --wait-for-rpc &
 pid=$!
 echo "iSCSI target launched. pid: $pid"
diff --git a/test/iscsi_tgt/iscsi_tgt.sh b/test/iscsi_tgt/iscsi_tgt.sh
index 9ef4e44bc..3f8181728 100755
--- a/test/iscsi_tgt/iscsi_tgt.sh
+++ b/test/iscsi_tgt/iscsi_tgt.sh
@@ -49,8 +49,6 @@ fi
 trap "cleanup_veth_interfaces $TEST_TYPE; exit 1" SIGINT SIGTERM EXIT
 
 if [ $SPDK_TEST_NVMF -eq 1 ]; then
-	# TODO: enable remote NVMe controllers with multi-process so that
-	#  we can use the stub for this test
 	# Test configure remote NVMe device from rpc and conf file
 	run_test suite ./test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
 fi
diff --git a/test/iscsi_tgt/multiconnection/multiconnection.sh b/test/iscsi_tgt/multiconnection/multiconnection.sh
index b793d7518..ef54cb84d 100755
--- a/test/iscsi_tgt/multiconnection/multiconnection.sh
+++ b/test/iscsi_tgt/multiconnection/multiconnection.sh
@@ -34,7 +34,6 @@ set -e
 timing_enter multiconnection
 
 timing_enter start_iscsi_tgt
-# Start the iSCSI target without using stub.
 $ISCSI_APP --wait-for-rpc &
 iscsipid=$!
 echo "iSCSI target launched. pid: $iscsipid"
diff --git a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
index 2f00b7a52..494a7b068 100755
--- a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
+++ b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
@@ -28,7 +28,6 @@ NETMASK=$INITIATOR_IP/32
 function run_nvme_remote() {
 	echo "now use $1 method to run iscsi tgt."
 
-	# Start the iSCSI target without using stub
 	iscsi_rpc_addr="/var/tmp/spdk-iscsi.sock"
 	ISCSI_APP="$rootdir/app/iscsi_tgt/iscsi_tgt"
 	$ISCSI_APP -r "$iscsi_rpc_addr" -m 0x1 -p 0 -s 512 --wait-for-rpc &
diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh
index c9eb8f214..c12ee7523 100755
--- a/test/nvmf/nvmf.sh
+++ b/test/nvmf/nvmf.sh
@@ -43,8 +43,6 @@ run_test suite test/nvmf/nmic/nmic.sh
 timing_exit host
 trap - SIGINT SIGTERM EXIT
 
-# TODO: enable nvme device detachment for multi-process so that
-#  we can use the stub for this test
 run_test suite test/nvmf/rpc/rpc.sh
 run_test suite test/nvmf/fio/fio.sh
 revert_soft_roce