Iterator inheritance cleanup