Cleanup of merge?