Removed old instance variables