Infiltration code cleanup
Merge pull request #3389 from ScottNZ/infil

Infiltration code cleanup