first pass
arg cleanup
cleanup
cleanup
Fix remove
Fix adapter command