Remove Singletons