Cleaned up PluginsService