More tidy up for composer.