remove control samples; add container name when flowcellid is null