TASK: support remove of task