Remove old moto vendor, use newer one, may need tweaking still