Revert c60d41a..0b65451

This rolls back to commit c60d41a4c7d49eb7217a8ba948112023b9bd6c05.
Remove un-used comments.