Lots of cleanup in the way tasks are send to the trainees