clean up Settings place
fix tests
Merge pull request #1163 from jay-hodgson/remove-settings-place

remove Settings place (clean up)