Remove useless ops with the AVP list.

(cherry picked from commit 8762c5e2e72e601337b9b2ddb9aaf32a44ddfc8c)