removed old query implementations