Cleanups in compressor