find_driver_index - cleanups