Removed instance variables, removed arrays