Removed unnecessary imports/variables.

EV-531