Some more removal of comments.