simplify and remove useless index in AV_W*