Cleanup Vendor
merged updates