Bug 923561 - Make help match usage

Bug 923559 - Make help match usage

* remove future options