(cleanup) remove unused imports

Change-Id: I7ba386c6a44acc748983803ef15e3a9bba697808