some more cleanup discovered during CiftiLib cleanup