Remove stale plugins
Cleaning up cruft and organizing things further