Aria roles, some foundation cleanup