Removed references from PluginFactory