minor removal of comments