Hygiene: Rm unused vars

Change-Id: Ib091b060bf03b2305ea65194569531dfb22f62eb
Merge "Hygiene: Rm unused vars"