Remove irrelevant use of instance variables