remove redundant options
Merge branch 'refs/heads/options'