removing all uses of corpus query