adjusting to queryobjectmodelfactory cleanup