Removed some unused options