Branch cleaning

Removing the crufty comments from the mpi2 branch's development.