Added remove of comments.