Still eliminating unused variables

parent 907b9164
Pipeline #10018 passed with stages
in 17 minutes and 33 seconds