removing more vars temporariliy