Remove redundant code
Indicate protocol in help text
Bugfix