Removed singletons from discovery and yamicontainer.