Ne review required - Remove old ACR/ACA definitions and update vendor IDs