Generated Plugin Cleanup, ES6 is Lovely :cat: