Merge "[Trivial]Remove unused variables and methods"