Cleanup adapters

Removed and cleaned up some adapters.
Merge pull request #32 from N-Pex/master

Cleanup adapters
Merge remote-tracking branch 'upstream/master' into paik
Merge pull request #34 from N-Pex/paik

Latest from master