Disclosed are advantageous systems and methods for treating building water systems, especially the interior surfaces of premise plumbing, to remove biofilm and inactivate biofilm-associated pathogens, including protozoa, using disinfectant formulations at concentrations at in excess of those used for drinking water treatment, and further, in co-applying complexing agents to mitigate corrosion of the materials treated; and using these in conjunction with off-gas containment devices that allow flushing of taps without the liberation of toxic fumes.