More DOI cleaning.