remove query builder requirement