Remove unused options and references to non-existent arguments
Merge pull request #2528 from astrofrog/issue-2528

SAMP: Documentation does not match calling signature