Clean-up of comments from previous commit