WaE: unused private fields

Change-Id: I2084fa7cc0af9385b532c6beab0368bc2e45e29e
WaE: unused variable

Change-Id: I2a479f87c63044d83a8271c0b1dc1698d52245a8