Remove AE2 rv1 support, update API to rv2