Remove references to Tire and comments