Updated adaptor and drivers, removed unnecessary params.