[Trivial]Remove unused variables

This is to remove unused variables and to use merging-isinstance.

Change-Id: I9d7121678a8b18a03b7b872526bfc74351560776
10 files changed