i actually am hoping they will remove the choices... by the end of the game (in the 2nd story arc, even) the pairs are clearly Tiffa/Cloud & Aeris/Zack... now keeping in the parts where Aeris explains that Cloud reminds her of Zack without mentioning his name yet is okay, but none of that misleading stuff we got in the first story arc of the game... it needs to be clearer that being around Cloud makes her miss Zack more as opposed to looking like she's fawning over Cloud...