Merge branch 'remove-unused-settings' into 'develop'