Merging cleanup