incorporated removal of links by matthew