Comments clean up.

Removed old todo comments.