Remove some redundant options