Finish removing MFR api