Move Relationships to Spec 3.
Cleanup.