Add and remove link/node properly