Fix 2328: In NS deletion, remove EE objects according to the VCA type