Remove unnesacary links causing problems