Cleaning up after merge