Remove deprecated code use (Drupal core 9.3.0 onward)

This will need work, although certain aspects of the patch will still apply others won't - please raise an MR. (Appreciate its old!)

Ive reviewed these changes, they're not applicable anymore as far as I can tell.