Cleaned up comments

No need to leave cruft. They can be found in git history if needed.