am 756c3f57: Findbugs fixes. Mostly performance related (remove unnecessary code, make inner classes static)

Merge commit '756c3f57f11a7bb3bf1cf1333ee8ffbc51039748'

* commit '756c3f57f11a7bb3bf1cf1333ee8ffbc51039748':
  Findbugs fixes. Mostly performance related (remove unnecessary code, make inner classes static)