Clean up things and use new IoC container.