Some merge screwed up and left extra code