More settings clean up.