Clean up VolunteerMentorQuery and usage