MBH: cleaning up file gatherer