pff: infrastructure code cleanup