Final cleanup of Relation.cpp