Cleanup adapters

Removed and cleaned up some adapters.