Adding better cleanup of events to the RedirectPlugin
3.5 release