Merge "Remove dead code from settings"