I would not remove Death Star II. It’s iconic, it’s something that’s a big part of Star Wars, like it or not. I mean, it’s even the logo for this website.
As a general rule, I wouldn’t remove things people expect to see when they watch a certain Star Wars movie. That includes major characters, settings and plot points. Like, if it would be on the poster of the movie, leave it. Jar Jar, ewoks, DSII, Star Killer Base, etc.