Strip out some more unused options