Fixing old submodules before deinit.
Removed rest of submodules after factoring out plugins.