Clean up some static initializers