Merge pull request #2374 from Montellese/settings_cleanup_2