Plugin Cleanup
Revert "Plugin Cleanup"

This reverts commit a90662569f63c8addb098e31ad9175d8cd927424.