ICC cleanups