Get rid of extra comments