Editing super leia seems pretty easy to do. Essentially removing the sections where she is sucked out … cut out her flying in. You can cut from the crew running down the hall and keep the part with her hand at the window.
The BB-8 and walker scene seems a bit tougher… I think I didn’t mind it too much.