[19942] Make remove unused entities compatible with the discovery trigger

[19942] Make remove unused entities compatible with the discovery trigger #1201