Removing extraneous things from Adaptor/Driver