Cleanup after Merge