CleanUpVendor fixed