Remove query builder