Hygiene: Remove unneeded vars

Don't know, why i kept them there.

Change-Id: I577ae31ca8f6f9d0a66279b6f2d80cbb2939e9e3
Merge "Hygiene: Remove unneeded vars"