command-line options cleanup

* Require one of -c and -s
* Remove obsolete options
* Add --verbose