SPO message clean-up