Removed stupid static fields