Better cleanup of one-time use MockPlugin event