About removing the container from the injected arguments, I have nothing against it. I didn't even know/remember it was actually injected. We just need to check what it would be used for, and refactor accordingly before removing it.