cleaned up MPI-and-OMP branch