Remove some unused options, and move one out of the "These are broken" section.
Merge pull request #3447 from thedax/master

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