clean up from merge v2