Cleanup after removal of API::parseRelationshipFields()