cleanup + icd change