Remove unused UI code
Merge branch 'master' into builds
7.365