Remove now-unused instance variables