Hygiene: Cleanup unused local variable warnings

Change-Id: I7092d735c6d4ec82715a07b6033a245224a05b06