Remove deprecated commandline switches.
Merge pull request #24 from robmen/remove-deprecations

Remove deprecated commandline switches.