Remove leftover from merge