Updated adaptor and drivers, removed unnecessary params.

Minor changes to remove unused params.