[FROGWARE] Optimized, reworked entity removal procedure.