Removed unused imports

Change-Id: I30586881bad9337e2bc57e6af9e919cf69ec181e