remove obsolete variables and update names

No match.