Remove more cruft
Migrate to submodules rather than duplicating plugins