Removing references to MPI