cleanup old ui
MPS-17694 MPS-17846