Removed mandatory fields