clean up usage
Merge pull request #2948 from gnawhleinad/master

command/*: clean up usage