Fixing wrong service injection
Removed deprecated calls