SES-1726 : Cleanup QueryResultCollector