Merge "Remove unneeded code that supported old UI" into udc-dev