[Trivial]Remove unused variables and methods

This is to remove unused variables and methods to keep code clean.

Change-Id: Ib0b1e6ecb23481103791b065a622b4b89190412e
8 files changed