Removed extra instance variables