Clean up FaresQueryBuilder