Merge "remove remaining references to XMA"