Many cleanups to driver before v1.0