Removes 'else'
Removes  method params, adds adapter getter/setter and allows for default adapter