Even more epic cleanup of the legacy plugin format stuff...