Revert "Revert "settings: Various cleanups""

This reverts commit b13fae2369a8acb5e097ce7a77be7ba1e350e548.
Remove Some Build Errors: <<<HEAD