Fixed removing entities in services