Merge "Remove obsolete argument from help output"