Remove unused controls and fix task.name output