Remove N+1 queries