CXX-399 Improve MCI cleanup

OK.