Interaction integrator choice cleanup: significant speedup