Tidy up after merge.