Cleanup from merge artifacts