Removed some unneeded static fields.