Updated function comment and removed unnecessary imports

EV-545