A bit cleanup
Organized plugins. Remove functions.