Merge clean up