Statics cleanup

* Statics cleanup