Removing debug info
Adding service locator delegator factory and related logic
Removing duplicated code - moving plugin manager proxying to delegator factories