remove old query utilities