Remove generic "AVP" AVPs and correct vendor IDs