cleanup variable tracking