Cleaning up Driver