Unused options removed