WaE: unused private fields

I don't know if the fields in question are going to be used later or
just leftovers, so even if I strongly suspect the latter, I put them
in #if 0.

Change-Id: Ia40354e653b1827ec046f32e21165db4ac7bc78e