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

Preview Give feedback

1. Make sure you are opening from a topic branch (/feature/fix/docs/ branch (right side)) and not your main branch.
2. Ensure that the pull request title represents the desired changelog entry.
3. New public fields and methods are annotated with @since TODO.
4. I read and followed the contribution guidelines.

[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