[IC] general cleanup