Removed unnecessary singletons