More comments and cleanup.
Removing an outdated comment.