Unused imports

Change-Id: If10857cc51931c88ac6766cb327e1bbdbb85d950