Add driver, remove unused