Comment out needless settings
Merge branch 'feature/remove-needless-settings' into staging/master
Merge branch 'staging/master'