Removed static fields