Remove unnecessary instance variables