mapVars cleanup