cleanups after merge of PR #739
Merge pull request #752 from dspaeth-faber/cleanups_after_settings_refactoring

cleanups after merge of PR #739