Completely remove use of Adaptor class

No match.