Get rid of Singletons