Remove IRI,  improve values.