Statics cleanup
Statics cleanup