More settings cleanup