Cleanup for merging