Moved changes from task to main controller removed task controller