BS-2861
Update messages and remove output on right operand