Simplify logic
Cleanup code
Clean-up legacy adapter
Clean-up legacy adapter
Clean-up legacy adapter
Reduce use of requestInjection
Prefer ctor injection