Removed unnecessarily adapters