Hygiene: Remove unused local variables

Change-Id: I6281092e98120d4a2d106c59188478e44a3e0ccf