Removed unused options/code.