Clean-up after merge