Remove some relics of the merge.