Now removes even if empty data