fix unused variables, dead code

Change-Id: If1e5a87d764174e0bf6cd6175d92e7bdf951de5a
3 files changed