Some settings cleanup.