Remove extra comments from previous merge.