I’ve read the books, played the games & seen the things that have been “removed” from canon, but are still referenced. The fact that you had to state “Current Disney Timeline” shows that there are multiple, and the current scatter point happens in a retcon.