[fix bug 854165] Clean up some settings.
Merge pull request #955 from jsocol/settings

[fix bug 854165] Clean up some settings.