Settings 3 code clean up.