Removed CDI injections - only remaining is IdentityProvider which is next