There can't be any confusion. I said it: the entire AE would be replaced. I'd recommand you keep version 1 though for you get a precise idea of the improvements / differences.
This won't happen before a time however for the reasons I said, and also because having released 4 versions (OE/AE) in a very tight space of time, I think it is better to let you appreciate its evolution.