Refactoring: remove app.diContainer, disposing, instances are created in factory now.