[IC] cpde cleanup