[IC} code cleanup
[IC] cleanup