Refactorings, cleanup, removed DI container injections