More integrator code cleanup