Completed removal of link references