Updated another TODO
Removed a TODO which has been done