Just cleaning up unused but set variables. 16ace528ac (cherry picked from commit 10c99d7b41)
16ace528ac
10c99d7b41