[changed] Singleton destructor to be safe if not of singleton type
[removed] GenericObjectFactory