> In the future this should be replaced by actually shipping classes that you can instantiate.

That's the goal! That's why I want to kill it - the sooner the better.
Actually it should be enough to move the needed methods to the interface IAppContainer and make sure proper interfaces are returned.