Removed some unnecessary vars