removed some unused options