clean up after driver api restructuring