Code cleanup

Some code cleanup to ensure it still builds the GMX_MPI only version properly.