\Drupal calls should be avoided in classes, use dependency injection instead

Please review MR.

I will review this MR.

I have tested the MR, and the use of Dependency Injection looks good and the site seems to be working fine.
Thanks.