Bug 971496 - stopped orphan links, enabled cleanup of existing orphan links