The Pahlavân-î Grîvpanvâr and late Parthian bodyguard cavalry are late cataphracts, just like the Hetairoi Kataphraktoi, Hye Sparapet (Hye Zoravar? Can't remember.) and the Sahiya Hadabara. Those will not get removed anytime soon. In fact, I'd opt for... Never? The Grivpanvar might have one or two questionable items, but because it is later, those factors are diminished. By EB2 when we have more control over recruiting limits and more power over the looks, those factors will get even further diminished.