Removed unneeded comments
Updated TODO.md