Merge "Remove useless UI code"