Bug 4644: TerminationPoint not remove from switch