Cleanup the entity remover and increase readability

[TheMeinerLP]

Overview

This pr improves the readability of the entity remover and removes some potential memory issue

Description

### Submitter Checklist
- [X] Make sure you are opening from a topic branch (**/feature/fix/docs/ branch** (right side)) and not your main branch.
- [X] Ensure that the pull request title represents the desired changelog entry.
- [X] New public fields and methods are annotated with `@since TODO`.
- [X] I read and followed the [contribution guidelines](https://github.com/IntellectualSites/.github/blob/main/CONTRIBUTING.md).

[dordsor21]

PR would be better suited for upstream tbh

[TheMeinerLP]

@dordsor21 I know that, but last time I was put down a bit to improve code. Since then I've had an aversion to them.
But feel free to copy the idea and pitch it to them. Please understand my decision