Fix references to XA states in comments, and remove unused import.