wagon phase cleanup