Remove unused imports

And one unused variable

Change-Id: I81edaf7ddedd7723c2601b30951ca82bd2cd5256
Merge "Remove unused imports"