Remove unused imports

Change-Id: Ibdde85c14693ade41ccb7debd8675c7e569ed01c