Removed unused query builder