Alter entity removal behaviour to make sure entity is clear out of map