Refactor code to support no AAF requests

No match.