Cleaning up the MockPlugin
Better cleanup of one-time use MockPlugin event
3.5 release