cleaned up IoC container