Some link cleanup