Now removing links correctly