some stuff should have been static

Change-Id: I0ce449e5148dee3b20afb1c1d939443c4de2b2d5
Merge "some stuff should have been static"