Clean up spoiler commits