MFC Cleanup and fixes ana