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

Please review MR.

Thanks. committed. But there are more occasions left.

The rest has been resolved in the mean time.

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