Removal of Adapter Methods. Part 2.