remove remaining MFC/R2 stuff