Removing unused instance variables