Removed the static fields from the header