SSP-2463 Cleanup event de-registration. Avoids lost planning events.