Removed model relationships, claims are working