Remove references to non-existing class IriValue

Change-Id: I80b3f4810d4cda95e032d06b1d43cbe96d2a0ccc