remove gaq calls