Remove cruft from merge