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

Please review MR.

Agreed - will need to test, but as an "eyeball test" this looks good.

Thanks @chaitanyadessai