removed singletons, cleanup