mf2 clean-up