Mpi cleanups

Cleanup code in MPI labs.