(minor) Remove unused instance variables