Removed driver option
Started transition to 1.1.x. Incomplete.