* cleanup from merge