link cleanup from previous merge