Removed static fields in class causing issues.