Organizing imports and removing unused instance variables.