handle removed entities

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>