Clean up use of Adapter class.