Update settings (and remove some from being tracked)