[fix bug 854165] Clean up some settings.