Remove some reminants of the merge