Delete UMS and some cleanup