Further cleanup of relationships