Merge pull request #598 from ndawe/master

histfactory: add RemoveChannel and RemoveSample