Remove in preparation for proper vendor drop