Merge pull request #2688 from ace20022/cleanup_settings