Removed old querybuilder