More driver cleanup