Revert: Refactor: Settings: Minor cleanup
Revert: Refactor: Settings: Minor cleanup

secret-project/circle-blvd,secret-project/circle-blvd,secret-project/circle-blvd,holmwell/circle-blvd,holmwell/circle-blvd,holmwell/circle-blvd,holmwell/circle-blvd,secret-project/circle-blvd