Vendor migration cleanup