Remove more references to NextSpoiler