Settings cleanup 3

xcode sync