Clean up extra queries generated by primary_person call