Remove PluginEvent
Merge