Issue #2002650 by mrsinguyen, chertzog, legolasbo, Erik Erskine, rhm50, sandergo90, grisendo, targoo, janstoeckler, maximpodorov, beowulf1416: Improve maintainability by removing unused local variables.