Removed some vars