wfs cleanup