More cleaning of Settings up to ~1778