[MRG] miscellaneous cleanup