removing extraneous comments and kruft