Start of cleanup and MPI can be disabled again