Updated adaptor and drivers, removed unnecessary params.
Merge pull request #18 from hybridgroup/standardize-callback

Updated adaptor and drivers, removed unnecessary params.