Removed a few more usages of settings holder