Ditch winston; add delete support