Depend on singletons, clean up.