Update to allow for _I in csf sample names
Move delete statements earlier to try and conserve a little more memory