Undo link cleanup, will redo so will be separate pull request