Add TODO, remove tags upon delete