Cleanup of some more Epetra remnants.
More cleanup.