Quick fix for delayed entity removals