Cleanup.Cleanup.Cleanup.
Also move all the unlocalized names to the Config classes.