Removed PluginServiceUtil class