More cleanup of outdated setings.