Clean up relational fields queryset usage