[IC] template cleanup