Update Scheduler to allow custom implementations of IPluginStore
Remove unused classes