link removal optimization; node itnernals refactored