A medical fluid machine, such as a dialysis machine, includes a pump that pumps a medical fluid and sterile water or other disinfecting liquid, such as ozonated water, for flushing and reconditioning the medical fluid machine. The machine may also include a heater that heats the medical fluid or disinfecting solution in order to kill bacteria and other microorganisms that may contaminate the machine after use. Disinfecting the machine, and a disposable kit used with the machine, may allow re-use of the disposable within a reasonable amount of time after completion of the disinfecting procedure. Dialysate treated with ultra-violet light or water with low concentrations of ozone also helps make the disposable kits suitable for reuse.