cleanups in the composer