Remove unused instance variables