Remove UMS, updates and some cleanup