Modified TODO
Added 1 task - to remove unused code.