Revert "Updated TODO"

This reverts commit b4200d4c0951f81a8118a0b4f8454d435b82b949.
Updated TODO
Merge branch 'master'