remove -s option per issue 429