Clean-up after settings refactoring