Removed older query builder proxies