Remove org assumptions from generic edition factory.