Some cleanup of Entities.