Big cleanup of useless dependencies & overlays - part 3 (Vendor/CM)