CXX-399 Improve MCI cleanup

@spencerjackson ping?