ICC: Cleanup some debug parts