Merge "Remove aai yaml files"