The JW sketch of 1M6 Ren’s Entrance appears to confirm this, too (references to “red thing” and “spiders”)

I can confirm this was filmed, because JW’s sketch for 2M2 Fixing The Helmet includes the notes “sword” and “head off”

Does the shooting schedule indicate that only Rey and BB-8 are to be present for the final shots? There’s been persistent rumors that more characters would appear at the end.