remove the --server options
Merge pull request #4194 from qunox/removeserver

remove the --server options