Clean up From merge