cleanup from merge