more dumb cleanup
name: handle removed entities