Change in vdsm[master]: cleanup: drop several unused local variables