fixed by removing the dead stores (I've assumed the method calls have no weird side effects)

Change-Id: I163de6df4e290ce7d98c6ef20e3518a5dcc21441