Slight cleanup of neighbour lists