further link cleanup