Remove some more uneeded options.