cleanup extraneous comments, etc