minor driver cleanup