Merge "drop unused option -s"