comment cleanup that should have been in the last checkin