Unused imports

Change-Id: Id415fb746d6754571207c226c57b2508354024d7