Keeping the Yoda scene and the war room can only be done by removing the end of the scene (which could actually work fine).

@Octorox, your edit is going to use Yoda vs Sidious I guess ? Having rewatched it today, there is definitely some (very) good stuff in it (visually it’s still stunning). In fact only the very beginning - “not if anything to say I have” - and the crazy laugh at the end are problematic… making the assumption you don’t have an issue with Yoda fighting with a saber, of course ! (Yoda going McClane in the pipe is still embarrassing though…)