Remove some unused options, and move one out of the "These are broken" section.