Remove reference to TaskManager