removed global singletons