[UI][JS] Some cleanup