Cleanup static fields