Some GameEntity cleanup