diff --git a/src/srun/msg.c b/src/srun/msg.c
index f291a08d6231b791684f52033a490b25fc323c6d..9317969dba9c6b4d84e48e9added92a65d029ba4 100644
--- a/src/srun/msg.c
+++ b/src/srun/msg.c
@@ -572,11 +572,7 @@ _exit_handler(srun_job_t *job, slurm_msg_t *exit_msg)
 		if (status) 
 			job->task_state[taskid] = SRUN_TASK_ABNORMAL_EXIT;
 		else {
-/* 			if (   (job->err[taskid] != IO_DONE)  */
-/* 			    || (job->out[taskid] != IO_DONE) ) */
-/* 				job->task_state[taskid] = SRUN_TASK_IO_WAIT; */
-/* 			else */
-/* 				job->task_state[taskid] = SRUN_TASK_EXITED; */
+			job->task_state[taskid] = SRUN_TASK_EXITED;
 		}
 
 		slurm_mutex_unlock(&job->task_mutex);
diff --git a/src/srun/srun_job.c b/src/srun/srun_job.c
index 9b2bd35ce0a1b0edd15db30f11ad77e44f573225..e6a56efe3ca29e525e8ba1c9f16710924ef23fa5 100644
--- a/src/srun/srun_job.c
+++ b/src/srun/srun_job.c
@@ -366,9 +366,7 @@ report_task_status(srun_job_t *job)
 
 	for (i = 0; i < opt.nprocs; i++) {
 		int state = job->task_state[i];
-/* 		if ((state == SRUN_TASK_EXITED)  */
-/* 		    && ((job->err[i] >= 0) || (job->out[i] >= 0))) */
-/* 			state = 4; */
+		debug3("  state of task %d is %d", i, state);
 		snprintf(buf, 256, "task%d", i);
 		hostlist_push(hl[state], buf); 
 	}
diff --git a/src/srun/srun_job.h b/src/srun/srun_job.h
index d73c3372d5be24500a52bfea97b13b0711e6ef8c..d62fa476c98727e6916bb3e59b48292cce0c30a9 100644
--- a/src/srun/srun_job.h
+++ b/src/srun/srun_job.h
@@ -82,7 +82,7 @@ typedef enum {
 	SRUN_TASK_INIT = 0,
 	SRUN_TASK_RUNNING,
 	SRUN_TASK_FAILED,
-	SRUN_TASK_IO_WAIT,
+	SRUN_TASK_IO_WAIT, /* this state deprecated with new eio stdio engine */
 	SRUN_TASK_EXITED,
 	SRUN_TASK_ABNORMAL_EXIT
 } srun_task_state_t;