-*-iri-*- removed deprecated and unused code