Cleanup.
Proposed fix for plugins.