CMS-1084 Use simpler DI framework. Cleaned up some code.