Injector passing with refactoring.
Cleaning up unused code & warnings.