Rem static use

Change-Id: I848e5e521d54ca39bd8add02fe3433fd021f463f