Remove non-used imports, variables

Change-Id: I8cff795db0336676c818b960b7ac58459aa83639