Clean up use of vendor-extra