Removing hard coded links