Cleanup comments.

Clean up some comments and remove debugging messages.