Added remove for neighbors and using iterator.