Removed some singletons, because singletons suck