Disposing adapter configurations + refactoring