Removed singletons

No more singletons :(