[SR-Users] removing xavp from the stack.