Remove unused settings
Merge pull request #2222 from darkwing/remove-dead-settings

Remove unused settings