Merge "More settings cleanup"