Refactor code to support no AAF requests