Infiltration code cleanup