Cleaner SPOILER handling