Remove DI warnings and references to outdated code

Closes #3613483

Merge request reports

Loading