Fixing idpQonvert cleanup.