removing links, adding locations