more task_controller cleanup