Fixed removing all entities