unset entity data field also if it is null