Remove static initializers

See the following
  081e33a126ab37b38254319b38ecd33f8fc4ec56
  570e4c3795240d98ae86aeb716f5f5257a64aabd
  d90ba8a58b76bef9d2fb5323ec0e251de0e38af3
  032704671f009c586ff8b75e34d5027ceab3d510
  2590f1e2174e97558461669792b565903a8398ca (revert 1 of the above)
  fe6a94f3693e27c3f509329aeece355c800a7e7f

Change-Id: I9aaedd3c55106b5890546e55bfa012bfa9d432f2
5 files changed