update of query gen class to remove stuff now refactored into pipeline, associated tests also removed from test query gen