[MRG] cleanup