Strafe cleanup. Tests with no intermediary Idle.