Removed singletons from discovery and yamicontainer.
Removed singletons from discovery and yamicontainer.
Removed singletons from discovery and yamicontainer.