Vendor cleanup
Cleanup