Composer.json cleanups