Remove UMS support and some cleanup