More cleanup of instructor_task.