more cleanup from merge