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

Please review MR.

The changes in the merge request seems to be working as expected.

Automatically closed - issue fixed for 2 weeks with no activity.

Crediting the people that helped out.