cleaned up adapter mess