Removed some more uneeded options.