some cleanup from last pull