clean up from merge