Removed adapter abstraction class...again