Setting / removing correct mandatory fields