Removing AAF references from policy-api