Removes adapters
Tests move abstractions