Description reviewed, remove TODO label