Clean up Driver.
Remove dead code.