Cleaning up cruft from merge