Backport dead code removal

Alex Pottrequested to merge
issue/entity_usage-3605887:3605887-8.x-2.x into 8.x-2.x

Closes #3605887

Merge request reports