Remove unneeded hardcoded fields