Composer cleanups