Cleanup from static field