Merge "Make the task remove a wct" into udc-dev