Remove MFR API and some misc functions for now