removed some vars