More settings housecleaning