Gavin's point link cleanup.