Unused imports

Change-Id: Id344f81b0cc583fceb4e6b0b870bf59e002b61d0