Ensure termination points are correctly deleted