removed join/relationship stuff