Remove -s option and improve docs.