Remove old singleton lifetime, added explicit lifetime container.