Removed all references to Undeclared instance variables and class variables