Fix self, duplicate neighbours