cleaning up driver more