Include remove flag in base entity
some game code cleanup