Removed unused imports

Change-Id: I1feb733e266f76426237d8bb03dbbda21e3ea238