Merge "Remove old MS UI"