Removed unused classes, optimized plugin.yml