Cleanup + composer update.