Remove more unused options.