Remove cruft from incomplete merge.